Skip to content

Commit

Permalink
Bump alpine to 3.19
Browse files Browse the repository at this point in the history
Signed-off-by: Waldemar Quevedo <wally@nats.io>
  • Loading branch information
wallyqs committed Jan 10, 2024
1 parent b79526a commit a8f4f50
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18
FROM alpine:3.19

ENV NATS_SERVER 2.10.7

Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion 2.10.x/scratch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM scratch
ENV PATH="$PATH:/"

COPY --from=nats:2.10.7-alpine3.18 /usr/local/bin/nats-server /nats-server
COPY --from=nats:2.10.7-alpine3.19 /usr/local/bin/nats-server /nats-server
COPY nats-server.conf /nats-server.conf

EXPOSE 4222 8222 6222
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18
FROM alpine:3.19

ENV NATS_SERVER 2.9.24

Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion 2.9.x/scratch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM scratch
ENV PATH="$PATH:/"

COPY --from=nats:2.9.24-alpine3.18 /usr/local/bin/nats-server /nats-server
COPY --from=nats:2.9.24-alpine3.19 /usr/local/bin/nats-server /nats-server
COPY nats-server.conf /nats-server.conf

EXPOSE 4222 8222 6222
Expand Down
8 changes: 4 additions & 4 deletions tests/build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -ex
ver=(NATS_SERVER 2.10.7)

(
cd "2.9.x/alpine3.18"
docker build --tag nats:${ver[1]}-alpine3.18 .
cd "2.9.x/alpine3.19"
docker build --tag nats:${ver[1]}-alpine3.19 .
)

(
Expand All @@ -16,8 +16,8 @@ ver=(NATS_SERVER 2.10.7)
ver=(NATS_SERVER 2.10.7)

(
cd "2.10.x/alpine3.18"
docker build --tag nats:${ver[1]}-alpine3.18 .
cd "2.10.x/alpine3.19"
docker build --tag nats:${ver[1]}-alpine3.19 .
)

(
Expand Down
4 changes: 2 additions & 2 deletions tests/run-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ex
ver=(NATS_SERVER 2.10.7)

images=(
"nats:${ver[1]}-alpine3.18"
"nats:${ver[1]}-alpine3.19"
"nats:${ver[1]}-scratch"
)

Expand All @@ -18,7 +18,7 @@ done
ver=(NATS_SERVER 2.10.7)

images=(
"nats:${ver[1]}-alpine3.18"
"nats:${ver[1]}-alpine3.19"
"nats:${ver[1]}-scratch"
)

Expand Down
4 changes: 2 additions & 2 deletions update.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
def update_env_var(base_dir: str, new_ver: str):
files = [
f"./{base_dir}/windowsservercore-1809/Dockerfile",
f"./{base_dir}/alpine3.18/Dockerfile",
f"./{base_dir}/alpine3.19/Dockerfile",
"./tests/build-images.sh",
"./tests/run-images.sh",
"./tests/build-images-2019.ps1",
Expand Down Expand Up @@ -68,7 +68,7 @@ def update_windows_shasums(base_dir: str, new_ver: str, shasums: typing.Dict):


def update_alpine_shasums(base_dir: str, new_ver: str, shasums: typing.Dict):
file = f"{base_dir}/alpine3.18/Dockerfile"
file = f"{base_dir}/alpine3.19/Dockerfile"

with open(file, "r") as fd:
data = fd.read()
Expand Down

0 comments on commit a8f4f50

Please sign in to comment.