diff --git a/.drone.yml b/.drone.yml index 1011e910..5916f332 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,9 +11,7 @@ steps: - name: build image: rancher/dapper:v0.6.0 commands: - - apk add make git curl - - ls -la - - ./scripts/package + - apk add make git curl bash file - make no-dapper environment: ARCH: "${DRONE_STAGE_ARCH}" diff --git a/Dockerfile b/Dockerfile index a40be592..16190df5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.21-alpine3.18 AS infra ARG ARCH=amd64 -RUN apk -U add bash coreutils git gcc musl-dev vim less file curl wget ca-certificates +RUN apk -U add bash coreutils git gcc musl-dev vim less curl wget ca-certificates # go imports version gopls/v0.15.3 # https://github.com/golang/tools/releases/latest RUN go install golang.org/x/tools/cmd/goimports@cd70d50baa6daa949efa12e295e10829f3a7bd46 diff --git a/Makefile b/Makefile index 305746b5..2258a001 100644 --- a/Makefile +++ b/Makefile @@ -34,4 +34,4 @@ build: .PHONY: no-dapper no-dapper: validate build - ./scripts/package \ No newline at end of file + ARCH=$(ARCH) ./scripts/package \ No newline at end of file