Skip to content

Commit e1fb5ef

Browse files
committed
api: update to go1.25.5 and remove version from Makefile
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent b8093b7 commit e1fb5ef

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
-
180180
name: Build api module image
181181
run: |
182-
make build GO_VERSION=${{ env.GO_VERSION }}
182+
make build
183183
-
184184
name: Validate swagger
185185
run: |

api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.25.4
3+
ARG GO_VERSION=1.25.5
44

55
FROM golang:${GO_VERSION}-alpine AS base
66
RUN apk add --no-cache bash make yamllint

api/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ DOCKER_RUN := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
1919

2020
DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),)
2121

22+
DOCKER_BUILD_ARGS += --build-arg=GO_VERSION
23+
DOCKER_BUILD_ARGS += --build-arg=SWAGGER_VERSION
24+
2225
BUILD_CMD := $(BUILDX) build
23-
GO_VERSION ?= 1.25.4
24-
SWAGGER_VERSION ?= v0.33.1
26+
2527
SWAGGER_DOCS_PORT ?= 9000
2628

2729
.DEFAULT_GOAL := help
2830

2931
.PHONY: build
3032
build:
31-
$(BUILD_CMD) \
32-
--build-arg GO_VERSION=$(GO_VERSION) \
33-
--build-arg SWAGGER_VERSION=$(SWAGGER_VERSION) \
33+
$(BUILD_CMD) $(DOCKER_BUILD_ARGS) \
3434
--target dev \
3535
--load \
3636
-t "$(DOCKER_IMAGE)" \
@@ -45,7 +45,7 @@ swagger-gen: build ## generate swagger API types
4545
swagger-docs: ## preview the API documentation
4646
@echo "API docs preview will be running at http://localhost:$(SWAGGER_DOCS_PORT)"
4747
@docker run --rm \
48-
-v $(PWD)/:/usr/share/nginx/html/swagger/ \
48+
-v ./:/usr/share/nginx/html/swagger/ \
4949
-e 'REDOC_OPTIONS=hide-hostname="true" lazy-rendering' \
5050
-e SPEC_URL="swagger/swagger.yaml" \
5151
-p $(SWAGGER_DOCS_PORT):80 \

0 commit comments

Comments
 (0)