[gimp-web/oscp] testing: Add CI, switch to UBI9, drop Let's Encrypt locations
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-web/oscp] testing: Add CI, switch to UBI9, drop Let's Encrypt locations
- Date: Tue, 24 May 2022 14:06:31 +0000 (UTC)
commit 715f374628fcd43389266ce1203b89248bb05eae
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Tue May 24 15:22:29 2022 +0200
testing: Add CI, switch to UBI9, drop Let's Encrypt locations
.gitlab-ci.yml | 6 ++++++
testing.gimp.org/Dockerfile | 17 ++++++++---------
.../app_data/httpd-cfg/testing.gimp.org.conf | 7 +------
3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b217338d..5a776c2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,3 +38,9 @@ www.gimp.org:
- .build
variables:
OCI_TAG: www
+
+testing.gimp.org:
+ extends:
+ - .build
+ variables:
+ OCI_TAG: testing
diff --git a/testing.gimp.org/Dockerfile b/testing.gimp.org/Dockerfile
index bcf5f706..ec0a1a1a 100644
--- a/testing.gimp.org/Dockerfile
+++ b/testing.gimp.org/Dockerfile
@@ -1,4 +1,5 @@
FROM quay.io/centos/centos:stream8
+
RUN dnf install -y python3-pip git make
ARG branch=testing
@@ -11,14 +12,12 @@ RUN git clone --depth 1 --branch $branch https://gitlab.gnome.org/Infrastructure
pip3 install -r py3-requirements.txt && \
make $target
-FROM centos/httpd-24-centos7
-USER root
-
-COPY app_data /opt/app-root/src
-COPY --from=0 /gimp-web/output /opt/app-root/src/html
-RUN chown -R 1000580000:1000580000 /opt/app-root/src
+FROM registry.access.redhat.com/ubi9/httpd-24
-EXPOSE 8080
+USER 0
+COPY --from=0 /gimp-web/output /tmp/src/
+RUN chown -R 1001:0 /tmp/src
-USER 1000580000
-ENTRYPOINT ["/usr/bin/run-httpd"]
+USER 1001
+RUN /usr/libexec/s2i/assemble
+CMD /usr/libexec/s2i/run
diff --git a/testing.gimp.org/app_data/httpd-cfg/testing.gimp.org.conf
b/testing.gimp.org/app_data/httpd-cfg/testing.gimp.org.conf
index a9b5292e..79e35b06 100644
--- a/testing.gimp.org/app_data/httpd-cfg/testing.gimp.org.conf
+++ b/testing.gimp.org/app_data/httpd-cfg/testing.gimp.org.conf
@@ -1,6 +1,5 @@
<VirtualHost *:8080>
- ServerName gimp-testing.openshift.gnome.org
- ServerAlias testing.gimp.org
+ ServerName testing.gimp.org
ServerAdmin webmaster gimp org
DocumentRoot /opt/app-root/src/html
@@ -72,7 +71,3 @@ m; \
<Directory "/opt/app-root/src/html">
Require all granted
</Directory>
-
-<LocationMatch "^/.well-known/acme-challenge">
- RedirectMatch ^(.*) https://letsencrypt.gnome.org$1
-</LocationMatch>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]