From 56315b39b46c8bf05ed9842b547b7d8ef5bfe526 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 17 Oct 2023 16:35:47 +0300 Subject: exp: switch to kaniko --- .docker/app/Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to '.docker/app') diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index d1320fc27..57b090335 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -33,15 +33,17 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP} ARG CI_COMMIT_SHA ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} -ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} -ADD --chmod=0755 updater.sh ${SCRIPT_ROOT} -ADD --chmod=0755 dcron.sh ${SCRIPT_ROOT} -ADD --chmod=0755 backup.sh /etc/periodic/weekly/backup +ADD .docker/app/startup.sh ${SCRIPT_ROOT} +ADD .docker/app/updater.sh ${SCRIPT_ROOT} +ADD .docker/app/dcron.sh ${SCRIPT_ROOT} +ADD .docker/app/backup.sh /etc/periodic/weekly/backup -ADD index.php ${SCRIPT_ROOT} -ADD config.docker.php ${SCRIPT_ROOT} +RUN chmod 0755 ${SCRIPT_ROOT}/*.sh -COPY --from=app-src . ${SRC_DIR} +ADD .docker/app/index.php ${SCRIPT_ROOT} +ADD .docker/app/config.docker.php ${SCRIPT_ROOT} + +COPY . ${SRC_DIR} ARG ORIGIN_REPO_XACCEL=https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git -- cgit v1.2.3 From b07ad642ded470f3ec5b30b52e85b42637aa8f60 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 19 Oct 2023 09:21:49 +0300 Subject: Revert "exp: switch to kaniko" This reverts commit 56315b39b46c8bf05ed9842b547b7d8ef5bfe526. --- .docker/app/Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to '.docker/app') diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 57b090335..d1320fc27 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -33,17 +33,15 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP} ARG CI_COMMIT_SHA ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} -ADD .docker/app/startup.sh ${SCRIPT_ROOT} -ADD .docker/app/updater.sh ${SCRIPT_ROOT} -ADD .docker/app/dcron.sh ${SCRIPT_ROOT} -ADD .docker/app/backup.sh /etc/periodic/weekly/backup +ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} +ADD --chmod=0755 updater.sh ${SCRIPT_ROOT} +ADD --chmod=0755 dcron.sh ${SCRIPT_ROOT} +ADD --chmod=0755 backup.sh /etc/periodic/weekly/backup -RUN chmod 0755 ${SCRIPT_ROOT}/*.sh +ADD index.php ${SCRIPT_ROOT} +ADD config.docker.php ${SCRIPT_ROOT} -ADD .docker/app/index.php ${SCRIPT_ROOT} -ADD .docker/app/config.docker.php ${SCRIPT_ROOT} - -COPY . ${SRC_DIR} +COPY --from=app-src . ${SRC_DIR} ARG ORIGIN_REPO_XACCEL=https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git -- cgit v1.2.3 From 6c75ea17da86ea4f6a72ad75d5c64823453ca900 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 19 Oct 2023 09:47:01 +0300 Subject: Revert "Revert "exp: switch to kaniko"" This reverts commit b07ad642ded470f3ec5b30b52e85b42637aa8f60. --- .docker/app/Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to '.docker/app') diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index d1320fc27..57b090335 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -33,15 +33,17 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP} ARG CI_COMMIT_SHA ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} -ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} -ADD --chmod=0755 updater.sh ${SCRIPT_ROOT} -ADD --chmod=0755 dcron.sh ${SCRIPT_ROOT} -ADD --chmod=0755 backup.sh /etc/periodic/weekly/backup +ADD .docker/app/startup.sh ${SCRIPT_ROOT} +ADD .docker/app/updater.sh ${SCRIPT_ROOT} +ADD .docker/app/dcron.sh ${SCRIPT_ROOT} +ADD .docker/app/backup.sh /etc/periodic/weekly/backup -ADD index.php ${SCRIPT_ROOT} -ADD config.docker.php ${SCRIPT_ROOT} +RUN chmod 0755 ${SCRIPT_ROOT}/*.sh -COPY --from=app-src . ${SRC_DIR} +ADD .docker/app/index.php ${SCRIPT_ROOT} +ADD .docker/app/config.docker.php ${SCRIPT_ROOT} + +COPY . ${SRC_DIR} ARG ORIGIN_REPO_XACCEL=https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git -- cgit v1.2.3