Skip to content

Commit

Permalink
Development: Unify docker image definitions
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche committed Dec 27, 2024
1 parent 116ed6a commit 1474f61
Show file tree
Hide file tree
Showing 20 changed files with 35 additions and 123 deletions.
2 changes: 1 addition & 1 deletion docker/artemis-migration-check-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
file: ./mysql.yml
service: mysql
migration-check:
image: alpine
image: docker.io/library/alpine:3.21.0
container_name: migration-check
command: /bin/sh -c "exit 0"
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion docker/artemis-migration-check-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
file: ./postgres.yml
service: postgres
migration-check:
image: alpine
image: docker.io/library/alpine:3.21.0
container_name: migration-check
command: /bin/sh -c "exit 0"
depends_on:
Expand Down
82 changes: 0 additions & 82 deletions docker/atlassian/atlassian-setup.sh

This file was deleted.

6 changes: 3 additions & 3 deletions docker/broker-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
jhipster-registry:
container_name: artemis-jhipster-registry
image: docker.io/jhipster/jhipster-registry:v7.4.0
pull_policy: if_not_present
pull_policy: missing
volumes:
- ./registry:/central-config
# When run with the "dev" Spring profile, the JHipster Registry will
Expand All @@ -28,8 +28,8 @@ services:

activemq-broker:
container_name: artemis-activemq-broker
image: docker.io/apache/activemq-artemis:2.33.0-alpine
pull_policy: if_not_present
image: docker.io/apache/activemq-artemis:2.39.0-alpine
pull_policy: missing
environment:
ARTEMIS_USER: ${BROKER_USER:-guest}
ARTEMIS_PASSWORD: ${BROKER_PASSWORD:-guest}
Expand Down
2 changes: 1 addition & 1 deletion docker/gitlab-gitlabci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
nginx['listen_port'] = 80
gitlab-runner:
image: docker.io/gitlab/gitlab-runner:latest
pull_policy: if_not_present
pull_policy: missing
container_name: artemis-gitlab-runner
volumes:
- /var/run/docker.sock:/var/run/docker.sock
Expand Down
4 changes: 2 additions & 2 deletions docker/mailhog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
services:
mailhog:
container_name: artemis-mailhog
image: docker.io/mailhog/mailhog
pull_policy: if_not_present
image: docker.io/mailhog/mailhog:v1.0.1
pull_policy: missing
ports:
- "1025:1025"
- "8025:8025"
Expand Down
10 changes: 6 additions & 4 deletions docker/monitoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
services:
prometheus:
container_name: artemis-prometheus
image: docker.io/prom/prometheus:v2.52.0
pull_policy: if_not_present
# TODO: check if we can upgrade to 3.x
image: docker.io/prom/prometheus:v2.55.1
pull_policy: missing
volumes:
- ./monitoring/prometheus/:/etc/prometheus/
# If you want to expose these ports outside your dev PC,
Expand All @@ -25,8 +26,9 @@ services:
network_mode: 'host' # to test locally running service
grafana:
container_name: artemis-grafana
image: docker.io/grafana/grafana:10.1.10
pull_policy: if_not_present
# TODO: check if we can upgrade to 11.x
image: docker.io/grafana/grafana:10.4.14
pull_policy: missing
volumes:
- ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/
environment:
Expand Down
12 changes: 2 additions & 10 deletions docker/moodle/moodle.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0

# Disclaimer: The service marks and trademarks mentioned herein belong to their respective owners.
# No commercial licensing for these products is provided through this file.
# This docker-compose configuration is derived from Bitnami's publicly shared files, accessible at https://github.com/bitnami/containers/tree/main/bitnami/moodle, and is distributed under an open-source license.
# The Moodle™ LMS included in this docker-compose is developed and overseen by Moodle HQ, an independent project from this adaptation and Bitnami.

version: '2'
services:
mariadb:
image: docker.io/bitnami/mariadb:10.6
image: docker.io/bitnami/mariadb:11.6.2
environment:
# ALLOW_EMPTY_PASSWORD is recommended only for development.
- ALLOW_EMPTY_PASSWORD=yes
Expand All @@ -23,7 +15,7 @@ services:
extra_hosts:
- "host.docker.internal:host-gateway"
moodle:
image: docker.io/bitnami/moodle:4.2
image: docker.io/bitnami/moodle:4.5.1
ports:
- '8085:8080'
- '443:8443'
Expand Down
2 changes: 1 addition & 1 deletion docker/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
mysql:
container_name: artemis-mysql
image: docker.io/library/mysql:9.1.0
pull_policy: if_not_present
pull_policy: missing
volumes:
- artemis-mysql-data:/var/lib/mysql
# DO NOT use this default file for production systems!
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
# nginx setup based on artemis prod ansible repository
container_name: artemis-nginx
image: docker.io/library/nginx:1.27.3
pull_policy: if_not_present
pull_policy: missing
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- ./nginx/timeouts.conf:/etc/nginx/conf.d/timeouts.conf:ro
Expand Down
4 changes: 2 additions & 2 deletions docker/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

services:
artemis-playwright:
image: mcr.microsoft.com/playwright:v1.44.0-jammy
pull_policy: if_not_present
image: mcr.microsoft.com/playwright:v1.49.1
pull_policy: missing
environment:
CI: 'true'
BASE_URL: 'https://artemis-nginx'
Expand Down
2 changes: 1 addition & 1 deletion docker/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
postgres:
container_name: artemis-postgres
image: docker.io/library/postgres:17.2-alpine
pull_policy: if_not_present
pull_policy: missing
user: postgres
command: ["postgres", "-c", "max_connections=10000"]
volumes:
Expand Down
4 changes: 2 additions & 2 deletions docker/saml-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
services:
saml-test:
container_name: artemis-saml-test
image: docker.io/jamedjo/test-saml-idp
pull_policy: if_not_present
image: docker.io/jamedjo/test-saml-idp:1.18
pull_policy: missing
ports:
- "9980:8080"
# expose the port to make it reachable docker internally even if the external port mapping changes
Expand Down
8 changes: 4 additions & 4 deletions docs/admin/setup/kubernetes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This section describes how to set up an environment deployed in Kubernetes.
Follow the links to install the tools which will be needed to proceed with the Kubernetes cluster setup.
The setup has been tested with the described versions; newer ones might work, too.

* `Docker <https://docs.docker.com/get-docker/>`__ - v20.10.7
* `Docker <https://docs.docker.com/get-docker/>`__ - v27.4.1
Docker is a platform for developing, shipping and running applications.
In our case, we will use it to build the images which we will deploy.
It is also needed from k3d to create a cluster. The cluster nodes are deployed on Docker containers.
Expand All @@ -24,17 +24,17 @@ The setup has been tested with the described versions; newer ones might work, to
Docker Hub is a service provided by Docker for finding and sharing container images.
Account in DockerHub is needed to push the Artemis image which will be used by the Kubernetes deployment.

* `k3d <https://k3d.io/#installation>`__ - v4.4.7
* `k3d <https://k3d.io/#installation>`__ - v5.7.5
k3d is a lightweight wrapper to run k3s which is a lightweight Kubernetes distribution in Docker.
k3d makes it very easy to create k3s clusters especially for local deployment on Kubernetes.

Windows users can use ``choco`` to install it. More details can be found in the link under ``Other Installation Methods``

* `kubectl <https://kubernetes.io/docs/tasks/tools/#kubectl>`__ - v1.21
* `kubectl <https://kubernetes.io/docs/tasks/tools/#kubectl>`__ - v1.32
kubectl is the Kubernetes command-line tool, which allows you to run commands against Kubernetes clusters.
It can be used to deploy applications, inspect and manage cluster resources, and view logs.

* `helm <https://helm.sh/docs/intro/install/>`__ - v3.6.3
* `helm <https://helm.sh/docs/intro/install/>`__ - v3.16.4
Helm is the package manager for Kubernetes. We will use it to install cert-manager and Rancher


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
terminationGracePeriodSeconds: 30
initContainers:
- name: init-ds
image: busybox:latest
image: docker.io/library/busybox:1.37.0
command:
- '/bin/sh'
- '-c'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
- configMapRef:
name: kafka
optional: false
image: confluentinc/cp-kafka:5.5.3
image: docker.io/confluentinc/cp-kafka:7.8.0
imagePullPolicy: Always
name: kafka
resources: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
- configMapRef:
name: zookeeper
optional: false
image: confluentinc/cp-zookeeper:5.5.3
image: docker.io/confluentinc/cp-zookeeper:7.8.0
imagePullPolicy: Always
name: zookeeper
ports:
Expand All @@ -51,4 +51,4 @@ spec:
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
terminationGracePeriodSeconds: 30
terminationGracePeriodSeconds: 30
2 changes: 1 addition & 1 deletion src/main/kubernetes/artemis/statefulsets/artemis-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
envFrom:
- configMapRef:
name: artemis-mysql
image: mysql:9.1.0
image: docker.io/library/mysql:9.1.0
imagePullPolicy: IfNotPresent
name: artemis-mysql
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
terminationGracePeriodSeconds: 10
containers:
- name: jhipster-registry
image: jhipster/jhipster-registry:v6.7.1
image: docker.io/jhipster/jhipster-registry:v7.4.0
ports:
- containerPort: 8761
envFrom:
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ zonky:
type: H2 # Alternatives: H2 / MYSQL / POSTGRES
postgres:
docker:
image: "postgres:17.2-alpine"
image: docker.io/library/postgres:17.2-alpine
tmpfs:
enabled: true
server:
Expand All @@ -217,7 +217,7 @@ zonky:
max_parallel_maintenance_workers: 4
mysql:
docker:
image: "mysql:9.1.0"
image: docker.io/library/mysql:9.1.0
tmpfs:
enabled: true

Expand Down

0 comments on commit 1474f61

Please sign in to comment.