olofvndrhr/flox-dockerized
Archived
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

fix image tags
All checks were successful
ci/woodpecker/tag/publish_docker Pipeline was successful
Details

Browse source
This commit is contained in:
Ivan Schaller 2022-06-18 13:50:11 +02:00
parent 42b35a28da
commit d3ef15ac2e
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.woodpecker/build_docker.yml
View file

@ -27,6 +27,7 @@ pipeline:
dockerfile: Dockerfile.amd64
auto_tag: true
auto_tag_suffix: linux-amd64
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
# build docker image for arm64
dryrun-build-arm64:
@ -42,4 +43,5 @@ pipeline:
dockerfile: Dockerfile.arm64
auto_tag: true
auto_tag_suffix: linux-arm64
build_args: BUILD_VERSION=${CI_COMMIT_TAG}

2
.woodpecker/publish_docker.yml
View file

@ -26,6 +26,7 @@ pipeline:
dockerfile: Dockerfile.amd64
auto_tag: true
auto_tag_suffix: linux-amd64
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
username:
from_secret: cr-dhub-username
password:
@ -44,6 +45,7 @@ pipeline:
dockerfile: Dockerfile.arm64
auto_tag: true
auto_tag_suffix: linux-arm64
build_args: BUILD_VERSION=${CI_COMMIT_TAG}
username:
from_secret: cr-dhub-username
password:

13
Dockerfile.amd64
View file

@ -13,16 +13,19 @@ RUN \
FROM cr.44net.ch/baseimages/debian-s6:1.3.5
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
ARG BUILD_VERSION
ENV FLOX_VERSION=${BUILD_VERSION}
LABEL version="${BUILD_VERSION}"
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
# install packages
ARG db_path='/flox/backend/database/db.sqlite'
RUN \
echo "**** installing base packages ****" && \
apt-get update && \
@ -46,7 +49,7 @@ RUN \
-e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
/app/flox/backend/.env && \
echo "**** other preparation ****" && \
mkdir -p mkdir -p /run/php/ && \
mkdir -p /run/php/ && \
touch /run/php/php7.4-fpm.sock && \
sed -i \
-e 's,user =.*,user = abc,g' \

13
Dockerfile.arm64
View file

@ -13,16 +13,19 @@ RUN \
FROM cr.44net.ch/baseimages/debian-s6:1.3.5
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
ARG BUILD_VERSION
ENV FLOX_VERSION=${BUILD_VERSION}
LABEL version="${BUILD_VERSION}"
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
# install packages
ARG db_path='/flox/backend/database/db.sqlite'
RUN \
echo "**** installing base packages ****" && \
apt-get update && \
@ -46,7 +49,7 @@ RUN \
-e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
/app/flox/backend/.env && \
echo "**** other preparation ****" && \
mkdir -p mkdir -p /run/php/ && \
mkdir -p /run/php/ && \
touch /run/php/php7.4-fpm.sock && \
sed -i \
-e 's,user =.*,user = abc,g' \