From c4dca967a8075080f0b16a8a0ab0ec07d7b4d621 Mon Sep 17 00:00:00 2001 From: colpari Date: Fri, 4 Feb 2022 21:24:53 +0100 Subject: [PATCH] switch to stable upstream source --- containers/zammad/Dockerfile | 6 ++++-- containers/zammad/setup.sh | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index 0d34b8b..bdbe71a 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -5,9 +5,11 @@ FROM ruby:2.7.4-slim AS builder ARG BUILD_DATE ARG DEBIAN_FRONTEND=noninteractive -ENV GIT_BRANCH colpari-develop +#ENV GIT_BRANCH colpari-develop +ENV GIT_BRANCH stable ENV GIT_URL ${PROJECT_URL}.git -ENV PROJECT_URL https://github.com/colpari/zammad +#ENV PROJECT_URL https://github.com/colpari/zammad +ENV PROJECT_URL https://github.com/zammad/zammad ENV RAILS_ENV production ENV RAILS_LOG_TO_STDOUT true ENV TAR_GZ_URL ${PROJECT_URL}/archive/${GIT_BRANCH}.tar.gz diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 7f21df1..0fe0e14 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -20,6 +20,7 @@ useradd -M -d "${ZAMMAD_DIR}" -s /bin/bash -u 1000 -g 1000 "${ZAMMAD_USER}" if [ "$1" = 'builder' ]; then cd "$(dirname "${ZAMMAD_TMP_DIR}")" + echo "using ${TAR_GZ_URL}" curl -s -J -L -O "${TAR_GZ_URL}" tar -xzf zammad-"${GIT_BRANCH}".tar.gz rm zammad-"${GIT_BRANCH}".tar.gz