[gimp-web/oscp] static: Switch to Stream 8/UBI 9, use GitLab CI and Quay



commit 9e9991ca12e5249165af9515da40174e4d622b15
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue May 24 15:08:16 2022 +0200

    static: Switch to Stream 8/UBI 9, use GitLab CI and Quay

 .gitlab-ci.yml             |  8 ++++++++
 static.gimp.org/Dockerfile | 19 +++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0f7a332..acb2d555 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,3 +9,11 @@ developer.gimp.org:
     CI_CUSTOM_IMAGE_NAME: gimp-web
     OCI_TAG: developer
   when: manual
+
+static.gimp.org:
+  extends:
+    - .kaniko-monorepo
+  variables:
+    CI_CUSTOM_IMAGE_NAME: gimp-web
+    OCI_TAG: static
+  when: manual
diff --git a/static.gimp.org/Dockerfile b/static.gimp.org/Dockerfile
index e8ab9a48..a9f36e61 100644
--- a/static.gimp.org/Dockerfile
+++ b/static.gimp.org/Dockerfile
@@ -1,4 +1,5 @@
-FROM centos:8
+FROM quay.io/centos/centos:stream8
+
 RUN dnf install -y python3-pip git make
 
 ARG branch=migrate/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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]