Skip to content

Commit

Permalink
Merge pull request #78 from samuelattwood/sattwood/deps
Browse files Browse the repository at this point in the history
Dependency Updates
  • Loading branch information
samuelattwood authored Dec 26, 2024
2 parents 5383fbd + e232ac6 commit b738216
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Adjust build version
id: embed_version
run: |
sed -i 's/^.*MARKER-REPLACE-LINE-IN-CI.*/echo "nats-box ${{ github.ref_name }}" >\&2/' profile.sh
- name: Setup QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Setup Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_CLI_TOKEN }}
Expand All @@ -37,7 +37,7 @@ jobs:
echo tags="latest,${version}" >> $GITHUB_OUTPUT
- name: Build and Push
uses: docker/bake-action@v2
uses: docker/bake-action@v5
env:
TAGS: "${{ steps.tags.outputs.tags }}"
REGISTRY: "natsio"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile-upstream:1.6
FROM golang:1.23.2-alpine AS builder
#syntax=docker/dockerfile-upstream:1.12
FROM golang:1.23.4-alpine AS builder

LABEL maintainer "Derek Collison <[email protected]>"

Check warning on line 4 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
LABEL maintainer "Waldemar Quevedo <[email protected]>"

Check warning on line 5 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
Expand All @@ -21,7 +21,7 @@ RUN <<EOT
go install github.com/nats-io/natscli/nats@v${VERSION_NATS}
EOT

FROM alpine:3.20.3
FROM alpine:3.21.0

ARG TARGETARCH

Expand Down
6 changes: 3 additions & 3 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ group "default" {
target "nats-box" {
dockerfile = "Dockerfile"
args = {
VERSION_NATS = "0.1.5"
VERSION_NATS_TOP = "0.6.2"
VERSION_NSC = "2.10.0"
VERSION_NATS = "0.1.6"
VERSION_NATS_TOP = "0.6.3"
VERSION_NSC = "2.10.2"
}
platforms = get_platforms_multiarch()
tags = get_tags("nats-box")
Expand Down

0 comments on commit b738216

Please sign in to comment.