[gimp-web/oscp] testing.developer: Add CI, switch to UBI9
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-web/oscp] testing.developer: Add CI, switch to UBI9
- Date: Tue, 24 May 2022 14:06:32 +0000 (UTC)
commit c4252edd67531dc13ccd7da4b3461a4cf4225ab4
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Tue May 24 16:06:14 2022 +0200
testing.developer: Add CI, switch to UBI9
.gitlab-ci.yml | 6 ++++++
testing.developer.gimp.org/Dockerfile | 17 ++++++++---------
.../app_data/httpd-cfg/testing.developer.gimp.org.conf | 9 ++-------
3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e0e2c9f..cc75e0b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,12 @@ developer.gimp.org:
variables:
OCI_TAG: developer
+testing.developer.gimp.org:
+ extends:
+ - .build
+ variables:
+ OCI_TAG: testing+developer
+
static.gimp.org:
extends:
- .build
diff --git a/testing.developer.gimp.org/Dockerfile b/testing.developer.gimp.org/Dockerfile
index b5d234e1..f529ae7b 100644
--- a/testing.developer.gimp.org/Dockerfile
+++ b/testing.developer.gimp.org/Dockerfile
@@ -5,14 +5,13 @@ RUN mkdir html && \
cd html && \
echo "Hello World" > index.html
-FROM centos/httpd-24-centos7
-USER root
-
-COPY app_data /opt/app-root/src
-COPY --from=0 /html /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
+ADD app_data /tmp/src
+COPY --from=0 /html /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.developer.gimp.org/app_data/httpd-cfg/testing.developer.gimp.org.conf
b/testing.developer.gimp.org/app_data/httpd-cfg/testing.developer.gimp.org.conf
index e2e50e4c..22a0adf8 100644
--- a/testing.developer.gimp.org/app_data/httpd-cfg/testing.developer.gimp.org.conf
+++ b/testing.developer.gimp.org/app_data/httpd-cfg/testing.developer.gimp.org.conf
@@ -1,15 +1,10 @@
<VirtualHost *:8080>
ServerName testing.developer.gimp.org
- ServerAlias testing-developer-gimp-web.openshift.gnome.org
ServerAdmin webmaster gimp org
- DocumentRoot /opt/app-root/src/html
+ DocumentRoot /opt/app-root/src/
</VirtualHost>
-<Directory "/opt/app-root/src/html">
+<Directory "/opt/app-root/src/">
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]