Skip to content

Commit 560f381

Browse files
committed
use Dockerfile as single source of truth for versions
Signed-off-by: Silvio Moioli <[email protected]>
1 parent f296c1c commit 560f381

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ jobs:
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v2
12-
- name: Read Versions File
13-
id: versions
14-
uses: falti/[email protected]
15-
with:
16-
path: versions
17-
log-variables: true
1812
- name: Set up QEMU
1913
uses: docker/setup-qemu-action@v2
2014
- name: Set up Docker Buildx
@@ -31,9 +25,6 @@ jobs:
3125
context: "{{defaultContext}}:package"
3226
platforms: linux/amd64,linux/arm64
3327
push: true
34-
build-args: |
35-
GO_VERSION=${{ steps.versions.outputs.go_version }}
36-
DLV_VERSION=${{ steps.versions.outputs.dlv_version }}
3728
tags: |
38-
ghcr.io/${{ github.repository }}:${{ steps.versions.outputs.dlv_version }}-${{ steps.versions.outputs.delve_debugger_version }}
29+
ghcr.io/${{ github.repository }}:${{ github.ref_name }}
3930
ghcr.io/${{ github.repository }}:latest

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
include versions
2-
31
IMAGE_NAME=ghcr.io/moio/delve-debugger
42

3+
GO_VERSION := $(shell grep '^ARG GO_VERSION=' package/Dockerfile | cut -d'=' -f2)
4+
DLV_VERSION := $(shell grep '^ARG DLV_VERSION=' package/Dockerfile | cut -d'=' -f2)
5+
DELVE_DEBUGGER_VERSION := $(shell grep '^ARG DELVE_DEBUGGER_VERSION=' package/Dockerfile | cut -d'=' -f2)
6+
57
K3D_IMPORT_CLUSTER=upstream
68

79
build:

package/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM registry.suse.com/suse/sle15:15.7
22

3-
ARG GO_VERSION
4-
ARG DLV_VERSION
3+
ARG GO_VERSION=1.24
4+
ARG DLV_VERSION=1.25.1
5+
ARG DELVE_DEBUGGER_VERSION=0
56

67
RUN zypper --non-interactive install --no-recommends go${GO_VERSION} git sudo
78

versions

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)