Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.1
uses: actions/checkout@v6
with:
fetch-depth: 1
- name: Build Toolbox image
Expand All @@ -19,7 +19,7 @@ jobs:
run: make shell-lint
- name: Draft release
if: github.ref == 'refs/heads/master'
uses: release-drafter/release-drafter@v6.0.0
uses: release-drafter/release-drafter@v6
with:
config-name: release-config.yaml
env:
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ jobs:
steps:
- name: Checkout repository
# This will checkout the release tag ref.
uses: actions/checkout@v4.2.2
uses: actions/checkout@v6
with:
fetch-depth: 1
- name: Log into registry
run: docker login -u seek --password-stdin <<< "${{ secrets.DOCKER_PASSWORD }}"
- name: Publish Docker image
# - name: Log into registry
# run: docker login -u seek --password-stdin <<< "${{ secrets.DOCKER_PASSWORD }}"
- name: Publish Docker image to ghcr.io
run: make build push push-latest RELEASE_VERSION=${GITHUB_REF#refs/tags/v}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Pin toolbox.mk
run: make pin RELEASE_VERSION=${GITHUB_REF#refs/tags/v}
- name: Upload toolbox.mk
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.22.0
FROM alpine:3.23

ARG TOOLBOX_VERSION
ENV TOOLBOX_VERSION="${TOOLBOX_VERSION}"
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ build:
@$(call banner,$@)
@docker build \
--build-arg TOOLBOX_VERSION=$(RELEASE_VERSION) \
-t seek/toolbox:$(RELEASE_VERSION) .
-t ghcr.io/seek-oss/toolbox:$(RELEASE_VERSION) .

##
## Pushes the Toolbox image to DockerHub.
## Pushes the Toolbox image to GitHub Container Registry.
##
.PHONY: push
push:
@$(call banner,$@)
@docker push seek/toolbox:$(RELEASE_VERSION)
@docker push ghcr.io/seek-oss/toolbox:$(RELEASE_VERSION)

##
## Tags and pushes a latest tag for the Toolbox image.
##
.PHONY: push-latest
push-latest:
@$(call banner,$@)
@docker tag seek/toolbox:$(RELEASE_VERSION) seek/toolbox:latest
@docker push seek/toolbox:latest
@docker tag ghcr.io/seek-oss/toolbox:$(RELEASE_VERSION) ghcr.io/seek-oss/toolbox:latest
@docker push ghcr.io/seek-oss/toolbox:latest

##
## Creates a pinned version of toolbox.mk.
Expand Down
2 changes: 1 addition & 1 deletion toolbox.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TOOLBOX_VERSION ?= latest
# Toolbox Docker image. Default image is exposed as a separate variable to
# allow importing Makefiles to override TOOLBOX_IMAGE but still retain a
# reference to the default to use to specify as a base image build arg.
DEFAULT_TOOLBOX_IMAGE := seek/toolbox:$(TOOLBOX_VERSION)
DEFAULT_TOOLBOX_IMAGE := ghcr.io/seek-oss/toolbox:$(TOOLBOX_VERSION)
TOOLBOX_IMAGE ?= $(DEFAULT_TOOLBOX_IMAGE)

# The TOOLBOX_CONFIG_FILE variable can be specified by the caller to override
Expand Down