Skip to content

Commit c624ff3

Browse files
committed
- Add ARG for MongoDB and Node
- Fix ARG for base image label
1 parent f87af74 commit c624ff3

9 files changed

+21
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ help:
4646
@echo "${PROJECT} Makefile."
4747
@echo "The following commands are available:"
4848
@echo ""
49-
@echo " make build DIMG=<IMAGE_DIR> : Build the specified Docker images"
49+
@echo " make build DIMG=<IMAGE_DIR> : Build the specified Docker images"
5050
@echo " make upload DIMG=<IMAGE_DIR> : Upload the specified Docker images (only with the right credentials)"
5151
@echo " make tag : Tag the Git repository"
5252
@echo ""

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.0.0
1+
13.1.0

src/alldev.Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ARG FLYWAY_VERSIONS="11.3.1,10.22.0,7.15.0,9.22.3"
1212
ARG GO_VERSION="1.23.6"
1313
ARG HUGO_VERSION="0.143.1"
1414
ARG KOTLIN_VERSION="2.1.10"
15+
ARG MONGODB_VERSION="8.0"
16+
ARG NODE_VERSION="22"
1517
ARG NOMAD_VERSION="1.9.5"
1618
ARG VENOM_VERSION="v1.2.0"
1719
ENV DEBIAN_FRONTEND noninteractive
@@ -45,12 +47,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
4547
&& apt install -y sudo curl locales apt-utils software-properties-common \
4648
&& curl -fsSL https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg \
4749
&& echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | tee /etc/apt/sources.list.d/corretto.list \
48-
&& curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor \
49-
&& echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/8.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list \
50+
&& curl -fsSL https://www.mongodb.org/static/pgp/server-${MONGODB_VERSION}.asc | gpg -o /usr/share/keyrings/mongodb-server-${MONGODB_VERSION}.gpg --dearmor \
51+
&& echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-${MONGODB_VERSION}.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/${MONGODB_VERSION} main" | sudo tee /etc/apt/sources.list.d/mongodb-org-${MONGODB_VERSION}.list \
5052
&& apt update \
5153
&& locale-gen en_US en_US.UTF-8 \
5254
&& dpkg-reconfigure locales \
53-
&& curl -sL https://deb.nodesource.com/setup_22.x | bash - \
55+
&& curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - \
5456
# install development packages and debugging tools
5557
&& apt install -y \
5658
alien \

src/gocd-agent-dood.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
ARG DEBIAN_VERSION="12"
1111
ARG GOCD_VERSION="v25.1.0"
1212
FROM gocd/gocd-agent-debian-${DEBIAN_VERSION}:${GOCD_VERSION}
13+
ARG DEBIAN_VERSION
14+
ARG GOCD_VERSION
1315
USER root
1416
ENV DEBIAN_FRONTEND noninteractive
1517
ENV TERM linux

src/gocd-agent-golang.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
ARG DEBIAN_VERSION="12"
1111
ARG GOCD_VERSION="v25.1.0"
1212
FROM gocd/gocd-agent-debian-${DEBIAN_VERSION}:${GOCD_VERSION}
13+
ARG DEBIAN_VERSION
14+
ARG GOCD_VERSION
1315
ARG FLYWAY_VERSIONS="11.3.1,10.22.0,7.15.0,9.22.3"
1416
ARG GO_VERSION="1.23.6"
1517
ARG NOMAD_VERSION="1.9.5"

src/gocd-agent-java.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
ARG DEBIAN_VERSION="12"
1111
ARG GOCD_VERSION="v25.1.0"
1212
FROM gocd/gocd-agent-debian-${DEBIAN_VERSION}:${GOCD_VERSION}
13+
ARG DEBIAN_VERSION
14+
ARG GOCD_VERSION
1315
ARG NOMAD_VERSION="1.9.5"
1416
ARG KOTLIN_VERSION="2.1.10"
1517
ARG VENOM_VERSION="v1.2.0"

src/gocd-agent-python.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
ARG DEBIAN_VERSION="12"
1111
ARG GOCD_VERSION="v25.1.0"
1212
FROM gocd/gocd-agent-debian-${DEBIAN_VERSION}:${GOCD_VERSION}
13+
ARG DEBIAN_VERSION
14+
ARG GOCD_VERSION
1315
USER root
1416
ENV DEBIAN_FRONTEND noninteractive
1517
ENV TERM linux

src/gocd-agent.Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
ARG DEBIAN_VERSION="12"
1111
ARG GOCD_VERSION="v25.1.0"
1212
FROM gocd/gocd-agent-debian-${DEBIAN_VERSION}:${GOCD_VERSION}
13+
ARG DEBIAN_VERSION
14+
ARG GOCD_VERSION
1315
ARG FLYWAY_VERSIONS="11.3.1,10.22.0,7.15.0,9.22.3"
1416
ARG GO_VERSION="1.23.6"
1517
ARG HUGO_VERSION="0.143.1"
1618
ARG KOTLIN_VERSION="2.1.10"
19+
ARG MONGODB_VERSION="8.0"
20+
ARG NODE_VERSION="22"
1721
ARG NOMAD_VERSION="1.9.5"
1822
ARG VENOM_VERSION="v1.2.0"
1923
LABEL com.tecnick.vendor="Tecnick.com"
@@ -44,7 +48,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
4448
&& echo " email = [email protected]" >> /home/go/.gitconfig \
4549
&& echo " name = gocd" >> /home/go/.gitconfig \
4650
# Add repositories and update
47-
&& curl -sL https://deb.nodesource.com/setup_22.x | bash - \
51+
&& curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - \
4852
&& apt update && apt -y dist-upgrade \
4953
&& apt install -y gnupg apt-utils software-properties-common \
5054
&& curl -fsSL https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg \

src/golang.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# ------------------------------------------------------------------------------
1010
ARG GO_VERSION="1.23"
1111
FROM golang:${GO_VERSION}
12+
ARG GO_VERSION
1213
ENV PATH=/root/.local/bin:$PATH
1314
ENV USER=root
1415
RUN apt update \

0 commit comments

Comments
 (0)