From 81cbf0aff703a734947aca284ec0c6d0187124e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Le=C3=B3n=20Peris?= Date: Tue, 16 Mar 2021 13:09:45 +0100 Subject: [PATCH 1/3] Changes to use the latest gogs image --- Dockerfile | 8 ++++---- openshift/gogs-persistent-template.yaml | 16 +++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e03405..b02c23b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM centos:7 -MAINTAINER Erik Jacobs +MAINTAINER Javier León Peris -ARG GOGS_VERSION="0.9.113" +ARG GOGS_VERSION="0.12.3" LABEL name="Gogs - Go Git Service" \ vendor="Gogs" \ @@ -19,9 +19,9 @@ ENV HOME=/var/lib/gogs COPY ./root / -RUN curl -L -o /etc/yum.repos.d/gogs.repo https://dl.packager.io/srv/pkgr/gogs/pkgr/installer/el/7.repo && \ - rpm --import https://rpm.packager.io/key && \ +RUN curl -L -o /etc/yum.repos.d/gogs.repo https://dl.packager.io/srv/gogs/gogs/main/installer/el/7.repo && \ yum -y install epel-release && \ + yum -y update && \ yum -y --setopt=tsflags=nodocs install gogs-${GOGS_VERSION} nss_wrapper gettext && \ yum -y clean all && \ mkdir -p /var/lib/gogs diff --git a/openshift/gogs-persistent-template.yaml b/openshift/gogs-persistent-template.yaml index dc1b305..ce9af1b 100644 --- a/openshift/gogs-persistent-template.yaml +++ b/openshift/gogs-persistent-template.yaml @@ -86,7 +86,7 @@ objects: failureThreshold: 10 resources: limits: - memory: 512Mi + memory: 1Gi volumeMounts: - mountPath: /var/lib/pgsql/data name: gogs-postgres-data @@ -238,7 +238,7 @@ objects: - name: "${GOGS_VERSION}" from: kind: DockerImage - name: docker.io/openshiftdemos/gogs:${GOGS_VERSION} + name: docker.io/javierleonperis/openshift-gogs:${GOGS_VERSION} importPolicy: {} annotations: description: The Gogs git server docker image @@ -309,6 +309,7 @@ parameters: - description: 'Custom hostname for http service route. Leave blank for default hostname, e.g.: -.' name: HOSTNAME required: true + value: gogs-git-server-02.apps.osh-jc2.om.dsn.inet - description: Volume space available for data, e.g. 512Mi, 2Gi name: GOGS_VOLUME_CAPACITY required: true @@ -323,14 +324,15 @@ parameters: name: DATABASE_USER - displayName: Database Password from: '[a-zA-Z0-9]{8}' - value: gogs + value: changeyourpassword name: DATABASE_PASSWORD - displayName: Database Name name: DATABASE_NAME value: gogs - displayName: Database Admin Password - from: '[a-zA-Z0-9]{8}' - generate: expression + #from: '[a-zA-Z0-9]{8}' + #generate: expression + value: changeyourpassword name: DATABASE_ADMIN_PASSWORD - displayName: Maximum Database Connections name: DATABASE_MAX_CONNECTIONS @@ -340,11 +342,11 @@ parameters: value: 12MB - displayName: Database version (PostgreSQL) name: DATABASE_VERSION - value: "9.5" + value: "latest" - name: GOGS_VERSION displayName: Gogs Version description: 'Version of the Gogs container image to be used (check the available version https://hub.docker.com/r/openshiftdemos/gogs/tags)' - value: "0.9.97" + value: "latest" required: true - name: INSTALL_LOCK displayName: Installation lock From 68ce3e2bd3ad101a4516ec5184c5554aace8bebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Le=C3=B3n=20Peris?= Date: Wed, 17 Mar 2021 10:23:28 +0100 Subject: [PATCH 2/3] Can't connect user gogs to postgresql --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b02c23b..875378d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM centos:7 MAINTAINER Javier León Peris -ARG GOGS_VERSION="0.12.3" +ARG GOGS_VERSION="0.12.1" LABEL name="Gogs - Go Git Service" \ vendor="Gogs" \ From 99aef97d0854f066e641205d746f563d1d366392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Le=C3=B3n=20Peris?= Date: Wed, 17 Mar 2021 11:21:15 +0100 Subject: [PATCH 3/3] Changes to use latest image of gogs --- openshift/gogs-persistent-template.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openshift/gogs-persistent-template.yaml b/openshift/gogs-persistent-template.yaml index ce9af1b..309add1 100644 --- a/openshift/gogs-persistent-template.yaml +++ b/openshift/gogs-persistent-template.yaml @@ -284,7 +284,7 @@ objects: HOST = ${APPLICATION_NAME}-postgresql:5432 NAME = ${DATABASE_NAME} USER = ${DATABASE_USER} - PASSWD = ${DATABASE_PASSWORD} + PASSWORD = ${DATABASE_PASSWORD} [repository] ROOT = /opt/gogs/data/repositories @@ -345,8 +345,8 @@ parameters: value: "latest" - name: GOGS_VERSION displayName: Gogs Version - description: 'Version of the Gogs container image to be used (check the available version https://hub.docker.com/r/openshiftdemos/gogs/tags)' - value: "latest" + description: 'Version of the Gogs container image to be used (check the available version https://hub.docker.com/repository/docker/javierleonperis/openshift-gogs/tags)' + value: "1.0" required: true - name: INSTALL_LOCK displayName: Installation lock