Skip to content

Commit

Permalink
Make It Possible to Version Container Images
Browse files Browse the repository at this point in the history
This avoids us being stuck in the maintainability hell that otherwise would result from using `latest`.
  • Loading branch information
Guy Elsmore-Paddock committed Apr 4, 2019
1 parent 2ece0cf commit 2fad224
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
12 changes: 12 additions & 0 deletions nextcloud-aks/config.example.env
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ LOCATION="West US 2"
#
POD_TYPE="apache"

##
# The default container version to publish and pull down.
#
# This can be overridden on the command-line by prefixing each command with it.
# For example:
# ```
# CONTAINER_VERSION=1.0.0 ./publish_container_images.sh
# CONTAINER_VERSION=1.0.0 ./deploy_nextcloud_app.sh
# ```
#
CONTAINER_VERSION="${CONTAINER_VERSION:-latest}"

################################################################################
# Kubernetes Cluster Settings
################################################################################
Expand Down
2 changes: 1 addition & 1 deletion nextcloud-aks/configs/nextcloud-apache.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
containers:
# Container: The Apache-based Nextcloud backend
- name: backend-nextcloud-apache
image: "${REGISTRY_HOST}/inveniem/nextcloud-apache:latest"
image: "${REGISTRY_HOST}/inveniem/nextcloud-apache:${CONTAINER_VERSION}"
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
4 changes: 2 additions & 2 deletions nextcloud-aks/configs/nextcloud-fpm-nginx.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
containers:
# Container: The PHP-FPM-based Nextcloud backend
- name: backend-nextcloud-fpm
image: "${REGISTRY_HOST}/inveniem/nextcloud-fpm:latest"
image: "${REGISTRY_HOST}/inveniem/nextcloud-fpm:${CONTAINER_VERSION}"
imagePullPolicy: Always
resources:
requests:
Expand Down Expand Up @@ -129,7 +129,7 @@ spec:
value: "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA"
# Container: Nginx Server Middleware
- name: middle-nextcloud-nginx
image: "${REGISTRY_HOST}/inveniem/nextcloud-nginx-middleware:latest"
image: "${REGISTRY_HOST}/inveniem/nextcloud-nginx-middleware:${CONTAINER_VERSION}"
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
5 changes: 3 additions & 2 deletions nextcloud-aks/docker/backend-nextcloud-apache/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
set -e
set -u

CONTAINER_NAME="inveniem/nextcloud-apache:latest"

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "${SCRIPT_DIR}"

source '../../config.env'

CONTAINER_VERSION="${CONTAINER_VERSION:-latest}"
CONTAINER_NAME="inveniem/nextcloud-apache:${CONTAINER_VERSION}"

../nextcloud-common/generate_nr_setup_command.sh

docker build -t "${CONTAINER_NAME}" -f Dockerfile ..
Expand Down
5 changes: 3 additions & 2 deletions nextcloud-aks/docker/backend-nextcloud-fpm/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
set -e
set -u

CONTAINER_NAME="inveniem/nextcloud-fpm:latest"

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "${SCRIPT_DIR}"

source '../../config.env'

CONTAINER_VERSION="${CONTAINER_VERSION:-latest}"
CONTAINER_NAME="inveniem/nextcloud-fpm:${CONTAINER_VERSION}"

../nextcloud-common/generate_nr_setup_command.sh

docker build -t "${CONTAINER_NAME}" -f Dockerfile ..
Expand Down
5 changes: 3 additions & 2 deletions nextcloud-aks/docker/middle-nextcloud-nginx/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
set -e
set -u

CONTAINER_NAME="inveniem/nextcloud-nginx-middleware:latest"

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "${SCRIPT_DIR}"

source '../../config.env'

CONTAINER_VERSION="${CONTAINER_VERSION:-latest}"
CONTAINER_NAME="inveniem/nextcloud-nginx-middleware:${CONTAINER_VERSION}"

docker build -t "${CONTAINER_NAME}" .
docker tag "${CONTAINER_NAME}" "${REGISTRY_HOST}/${CONTAINER_NAME}"

Expand Down

0 comments on commit 2fad224

Please sign in to comment.