This commit is contained in:
parent
42b35a28da
commit
d3ef15ac2e
4 changed files with 20 additions and 10 deletions
|
@ -27,6 +27,7 @@ pipeline:
|
||||||
dockerfile: Dockerfile.amd64
|
dockerfile: Dockerfile.amd64
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
auto_tag_suffix: linux-amd64
|
auto_tag_suffix: linux-amd64
|
||||||
|
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
|
||||||
|
|
||||||
# build docker image for arm64
|
# build docker image for arm64
|
||||||
dryrun-build-arm64:
|
dryrun-build-arm64:
|
||||||
|
@ -42,4 +43,5 @@ pipeline:
|
||||||
dockerfile: Dockerfile.arm64
|
dockerfile: Dockerfile.arm64
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
auto_tag_suffix: linux-arm64
|
auto_tag_suffix: linux-arm64
|
||||||
|
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ pipeline:
|
||||||
dockerfile: Dockerfile.amd64
|
dockerfile: Dockerfile.amd64
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
auto_tag_suffix: linux-amd64
|
auto_tag_suffix: linux-amd64
|
||||||
|
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
|
||||||
username:
|
username:
|
||||||
from_secret: cr-dhub-username
|
from_secret: cr-dhub-username
|
||||||
password:
|
password:
|
||||||
|
@ -44,6 +45,7 @@ pipeline:
|
||||||
dockerfile: Dockerfile.arm64
|
dockerfile: Dockerfile.arm64
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
auto_tag_suffix: linux-arm64
|
auto_tag_suffix: linux-arm64
|
||||||
|
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
|
||||||
username:
|
username:
|
||||||
from_secret: cr-dhub-username
|
from_secret: cr-dhub-username
|
||||||
password:
|
password:
|
||||||
|
|
|
@ -13,16 +13,19 @@ RUN \
|
||||||
FROM cr.44net.ch/baseimages/debian-s6:1.3.5
|
FROM cr.44net.ch/baseimages/debian-s6:1.3.5
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_VERSION
|
||||||
ARG VERSION
|
ENV FLOX_VERSION=${BUILD_VERSION}
|
||||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL version="${BUILD_VERSION}"
|
||||||
LABEL maintainer="Ivan Schaller"
|
LABEL maintainer="Ivan Schaller"
|
||||||
|
LABEL description="A personal watchlist"
|
||||||
|
|
||||||
ARG db_path='/flox/backend/database/db.sqlite'
|
|
||||||
|
|
||||||
|
# copy app from build step
|
||||||
COPY --from=composer /build/flox /app/flox
|
COPY --from=composer /build/flox /app/flox
|
||||||
|
|
||||||
|
|
||||||
# install packages
|
# install packages
|
||||||
|
ARG db_path='/flox/backend/database/db.sqlite'
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** installing base packages ****" && \
|
echo "**** installing base packages ****" && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
|
@ -46,7 +49,7 @@ RUN \
|
||||||
-e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
|
-e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
|
||||||
/app/flox/backend/.env && \
|
/app/flox/backend/.env && \
|
||||||
echo "**** other preparation ****" && \
|
echo "**** other preparation ****" && \
|
||||||
mkdir -p mkdir -p /run/php/ && \
|
mkdir -p /run/php/ && \
|
||||||
touch /run/php/php7.4-fpm.sock && \
|
touch /run/php/php7.4-fpm.sock && \
|
||||||
sed -i \
|
sed -i \
|
||||||
-e 's,user =.*,user = abc,g' \
|
-e 's,user =.*,user = abc,g' \
|
||||||
|
|
|
@ -13,16 +13,19 @@ RUN \
|
||||||
FROM cr.44net.ch/baseimages/debian-s6:1.3.5
|
FROM cr.44net.ch/baseimages/debian-s6:1.3.5
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_VERSION
|
||||||
ARG VERSION
|
ENV FLOX_VERSION=${BUILD_VERSION}
|
||||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL version="${BUILD_VERSION}"
|
||||||
LABEL maintainer="Ivan Schaller"
|
LABEL maintainer="Ivan Schaller"
|
||||||
|
LABEL description="A personal watchlist"
|
||||||
|
|
||||||
ARG db_path='/flox/backend/database/db.sqlite'
|
|
||||||
|
|
||||||
|
# copy app from build step
|
||||||
COPY --from=composer /build/flox /app/flox
|
COPY --from=composer /build/flox /app/flox
|
||||||
|
|
||||||
|
|
||||||
# install packages
|
# install packages
|
||||||
|
ARG db_path='/flox/backend/database/db.sqlite'
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** installing base packages ****" && \
|
echo "**** installing base packages ****" && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
|
@ -46,7 +49,7 @@ RUN \
|
||||||
-e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
|
-e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
|
||||||
/app/flox/backend/.env && \
|
/app/flox/backend/.env && \
|
||||||
echo "**** other preparation ****" && \
|
echo "**** other preparation ****" && \
|
||||||
mkdir -p mkdir -p /run/php/ && \
|
mkdir -p /run/php/ && \
|
||||||
touch /run/php/php7.4-fpm.sock && \
|
touch /run/php/php7.4-fpm.sock && \
|
||||||
sed -i \
|
sed -i \
|
||||||
-e 's,user =.*,user = abc,g' \
|
-e 's,user =.*,user = abc,g' \
|
||||||
|
|
Reference in a new issue