marc/spadinastan
Archived
1
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

feat: update all services to tag images with release or dev+hash

Browse source 
docs: mention version-tagging
This commit is contained in:
Marc 2023-12-15 23:52:03 -05:00
parent 4719a9d64c
commit e0a20dbe91
Signed by: marc
GPG key ID: 048E042F22B5DC79
11 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -35,3 +35,8 @@ env:
``` ```
The `env.yml` file is ignored by version-control. The `env.yml` file is ignored by version-control.
### Image versions
When building and starting images, images are tagged with either the release version (if on a commit that's tagged with
a release) or a dev tag that includes the hash (i.e. `dev-<commit-hash>`).

2
services/bastion/build.sh
View file

@ -2,4 +2,4 @@
source constants.sh source constants.sh
docker build -t $APP_IMAGE_NAME:dev -f Dockerfile-bastion-app . docker build -t $APP_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bastion-app .

2
services/bastion/start.sh
View file

@ -9,4 +9,4 @@ docker run \
--network $NETWORK_NAME \ --network $NETWORK_NAME \
--name $APP_CONTAINER_NAME \ --name $APP_CONTAINER_NAME \
--env-file $ENV_FILE_DIR/bastion.env \ --env-file $ENV_FILE_DIR/bastion.env \
$APP_IMAGE_NAME:dev $APP_IMAGE_NAME:$IMAGE_VERSION

4
services/bitwarden/build.sh
View file

@ -2,5 +2,5 @@
source constants.sh source constants.sh
docker build -t $DB_IMAGE_NAME:dev -f Dockerfile-bitwarden-db . docker build -t $DB_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bitwarden-db .
docker build -t $APP_IMAGE_NAME:dev -f Dockerfile-bitwarden-app . docker build -t $APP_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bitwarden-app .

4
services/bitwarden/start.sh
View file

@ -10,7 +10,7 @@ docker run \
--name $DB_CONTAINER_NAME \ --name $DB_CONTAINER_NAME \
--env-file $ENV_FILE_DIR/bitwarden-db.env \ --env-file $ENV_FILE_DIR/bitwarden-db.env \
--mount type=bind,source=$APP_DATA_DIR/bitwarden/db,target=/var/lib/mysql \ --mount type=bind,source=$APP_DATA_DIR/bitwarden/db,target=/var/lib/mysql \
$DB_IMAGE_NAME:dev $DB_IMAGE_NAME:$IMAGE_VERSION
docker run \ docker run \
--detach \ --detach \
@ -20,4 +20,4 @@ docker run \
--publish 8080:8080 \ --publish 8080:8080 \
--mount type=bind,source=$APP_DATA_DIR/bitwarden/config,target=/etc/bitwarden \ --mount type=bind,source=$APP_DATA_DIR/bitwarden/config,target=/etc/bitwarden \
--mount type=bind,source=$APP_DATA_DIR/bitwarden/logs,target=/var/log/bitwarden \ --mount type=bind,source=$APP_DATA_DIR/bitwarden/logs,target=/var/log/bitwarden \
$APP_IMAGE_NAME:dev $APP_IMAGE_NAME:$IMAGE_VERSION

4
services/bookstack/build.sh
View file

@ -2,5 +2,5 @@
source constants.sh source constants.sh
docker build -t $DB_IMAGE_NAME:dev -f Dockerfile-bookstack-db . docker build -t $DB_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bookstack-db .
docker build -t $APP_IMAGE_NAME:dev -f Dockerfile-bookstack-app . docker build -t $APP_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bookstack-app .

4
services/bookstack/start.sh
View file

@ -10,7 +10,7 @@ docker run \
--name $DB_CONTAINER_NAME \ --name $DB_CONTAINER_NAME \
--env-file $ENV_FILE_DIR/bookstack-db.env \ --env-file $ENV_FILE_DIR/bookstack-db.env \
--mount type=bind,source=$APP_DATA_DIR/bookstack-db,target=/var/lib/mysql \ --mount type=bind,source=$APP_DATA_DIR/bookstack-db,target=/var/lib/mysql \
$DB_IMAGE_NAME:dev $DB_IMAGE_NAME:$IMAGE_VERSION
docker run \ docker run \
--detach \ --detach \
@ -19,4 +19,4 @@ docker run \
--env-file $ENV_FILE_DIR/bookstack-app.env \ --env-file $ENV_FILE_DIR/bookstack-app.env \
--publish 6875:80 \ --publish 6875:80 \
--mount type=bind,source=$APP_DATA_DIR/bookstack-app,target=/config \ --mount type=bind,source=$APP_DATA_DIR/bookstack-app,target=/config \
$APP_IMAGE_NAME:dev $APP_IMAGE_NAME:$IMAGE_VERSION

2
services/deluge/build.sh
View file

@ -2,4 +2,4 @@
source constants.sh source constants.sh
docker build -t $APP_IMAGE_NAME:dev -f Dockerfile-deluge-app . docker build -t $APP_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-deluge-app .

2
services/deluge/start.sh
View file

@ -15,4 +15,4 @@ docker run \
--mount type=bind,source=$APP_DATA_DIR/deluge/config,target=/config \ --mount type=bind,source=$APP_DATA_DIR/deluge/config,target=/config \
--mount type=bind,source=$APP_DATA_DIR/deluge/downloads,target=/downloads \ --mount type=bind,source=$APP_DATA_DIR/deluge/downloads,target=/downloads \
--mount type=bind,source=$STORAGE_DIR,target=/complete \ --mount type=bind,source=$STORAGE_DIR,target=/complete \
$APP_IMAGE_NAME:dev $APP_IMAGE_NAME:$IMAGE_VERSION

2
services/plex/build.sh
View file

@ -2,4 +2,4 @@
source constants.sh source constants.sh
docker build -t $APP_IMAGE_NAME:dev -f Dockerfile-plex-app . docker build -t $APP_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-plex-app .

2
services/plex/start.sh
View file

@ -21,4 +21,4 @@ docker run \
--mount type=bind,source=$APP_DATA_DIR/plex/database,target=/config \ --mount type=bind,source=$APP_DATA_DIR/plex/database,target=/config \
--mount type=bind,source=$APP_DATA_DIR/plex/transcode,target=/transcode \ --mount type=bind,source=$APP_DATA_DIR/plex/transcode,target=/transcode \
--mount type=bind,source=$STORAGE_DIR/media,target=/data \ --mount type=bind,source=$STORAGE_DIR/media,target=/data \
$APP_IMAGE_NAME:dev $APP_IMAGE_NAME:$IMAGE_VERSION