From 9a879e1e2fd69289cda1ca36fcdf6a5620c69fed Mon Sep 17 00:00:00 2001 From: jweatherford Date: Fri, 20 Nov 2020 12:28:14 -0500 Subject: [PATCH 1/5] fixed a typo in the filename --- download.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.yaml b/download.yaml index d86b050..1c15033 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - url: https://product-downloads.atlassian.com/software/fisheye/downloads/fisheye-4.8.4.zip - filename: "fishey-4.8.4.zip" + filename: "fisheye-4.8.4.zip" validation: type: sha512 value: 15233500e1ae836646a26b4fdc7000460262c1aeb9da10c0127f49840f66fc31d07be569db8360fa2c00a613650577ff754422f32f8dbb251b43451d87fd6b7d -- GitLab From f7389683de24db1d603fdac9368f3290e333a41d Mon Sep 17 00:00:00 2001 From: jweatherford Date: Fri, 20 Nov 2020 12:40:53 -0500 Subject: [PATCH 2/5] had to de-alpine some more --- Dockerfile | 10 ++++++---- README.md | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1a08cc..62542e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,11 @@ ENV FECRU_INST /opt/atlassian/fecru ENV FECRU_HOME /var/opt/atlassian/application-data/fecru ENV SYSTEM_USER fecru ENV SYSTEM_GROUP fecru +ENV SYSTEM_GID 3001 +ENV SYSTEM_UID 3001 ENV SYSTEM_HOME /home/fecru + USER root COPY fisheye-${VERSION}.zip /tmp/ @@ -37,8 +40,8 @@ RUN dnf -y update && dnf -y upgrade \ && mkdir -p ${FECRU_INST} \ && mkdir -p ${FECRU_HOME} \ && mkdir -p /home/${SYSTEM_USER} \ - && addgroup -S ${SYSTEM_GROUP} \ - && adduser -S -D -G ${SYSTEM_GROUP} -h ${SYSTEM_GROUP} -s /bin/sh ${SYSTEM_USER} \ + && groupadd --gid ${SYSTEM_GID} ${SYSTEM_GROUPRUN_GROUP} \ + && useradd --uid ${SYSTEM_UID} --gid ${SYSTEM_GID} --home-dir ${SYSTEM_HOME} ${SYSTEM_USER} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} /home/${SYSTEM_USER} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_INST} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_HOME} @@ -47,11 +50,10 @@ RUN dnf -y update && dnf -y upgrade \ && mv /tmp/fecru-${VERSION}/* ${FECRU_INST} \ && rm -rf /tmp/fecru-${VERSION} \ && rm /tmp/fisheye-${VERSION}.zip \ - && dnf clean all + && dnf -y clean all && touch -d "@0" "${FECRU_INST}/config.xml" \ && touch -d "@0" "${FECRU_INST}/bin/fisheyectl.sh" -# && apk add openssh git unzip xmlstarlet wget ca-certificates --update-cache --allow-untrusted --repository http://dl-cdn.alpinelinux.org/alpine/edge/main --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ ADD scripts/service /usr/local/bin/service ADD scripts/entrypoint /usr/local/bin/entrypoint diff --git a/README.md b/README.md index b1efe41..c0b15d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # docker-atlassian-fecru -This is a Docker-Image for Atlassian Fisheye/Crucible based on [UBI](http://registry1.dsop.ioalpinelinux.org/), which is kept as small as possible. +This is a Docker-Image for Atlassian Fisheye/Crucible based on [UBI + OpenJDK 8](https://registry1.dsop.io/harbor/projects/3/repositories/redhat%2Fopenjdk%2Fopenjdk8/), which is kept as small as possible. ## Features -- GitLab From 8c38b0e38502a7c0b3110a02b14da4a2cd2c1447 Mon Sep 17 00:00:00 2001 From: jweatherford Date: Fri, 20 Nov 2020 12:48:50 -0500 Subject: [PATCH 3/5] had the wrong variable for the group name --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62542e0..54aa35e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN dnf -y update && dnf -y upgrade \ && mkdir -p ${FECRU_INST} \ && mkdir -p ${FECRU_HOME} \ && mkdir -p /home/${SYSTEM_USER} \ - && groupadd --gid ${SYSTEM_GID} ${SYSTEM_GROUPRUN_GROUP} \ + && groupadd --gid ${SYSTEM_GID} ${SYSTEM_GROUP} \ && useradd --uid ${SYSTEM_UID} --gid ${SYSTEM_GID} --home-dir ${SYSTEM_HOME} ${SYSTEM_USER} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} /home/${SYSTEM_USER} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_INST} \ -- GitLab From ca918f05496182ecdcf0692e48f6da1d6073efc2 Mon Sep 17 00:00:00 2001 From: jweatherford Date: Fri, 20 Nov 2020 12:58:30 -0500 Subject: [PATCH 4/5] missing a char...whoops --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54aa35e..03decf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN dnf -y update && dnf -y upgrade \ && mv /tmp/fecru-${VERSION}/* ${FECRU_INST} \ && rm -rf /tmp/fecru-${VERSION} \ && rm /tmp/fisheye-${VERSION}.zip \ - && dnf -y clean all + && dnf -y clean all \ && touch -d "@0" "${FECRU_INST}/config.xml" \ && touch -d "@0" "${FECRU_INST}/bin/fisheyectl.sh" -- GitLab From 625d82edca6f72bd5be60a12b08c788100e82848 Mon Sep 17 00:00:00 2001 From: jweatherford Date: Fri, 20 Nov 2020 13:09:41 -0500 Subject: [PATCH 5/5] another missing a char...whoops --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03decf8..67e7f74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN dnf -y update && dnf -y upgrade \ && useradd --uid ${SYSTEM_UID} --gid ${SYSTEM_GID} --home-dir ${SYSTEM_HOME} ${SYSTEM_USER} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} /home/${SYSTEM_USER} \ && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_INST} \ - && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_HOME} + && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_HOME} \ && dnf -y install git unzip \ && unzip /tmp/fisheye-${VERSION}.zip -d /tmp/ \ && mv /tmp/fecru-${VERSION}/* ${FECRU_INST} \ -- GitLab