Skip to content

Commit 90606f7

Browse files
committed
fix gocilint install in Dockerfile, docker-compose -> docker compose
1 parent 6f3c886 commit 90606f7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ RUN mkdir -p /tmp/gotestsum \
7777
# go linting: (this package should NOT be installed via go get)
7878
# https://github.com/golangci/golangci-lint#binary
7979
# https://github.com/golangci/golangci-lint/releases
80-
RUN && GOLANG_CI_LINT_VERSION="1.64.8" \
80+
RUN GOLANG_CI_LINT_VERSION="1.64.8" \
8181
&& curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
8282
| sh -s -- -b $(go env GOPATH)/bin v${GOLANG_CI_LINT_VERSION}
8383

@@ -165,7 +165,7 @@ ENV PATH $PATH:$GOBIN
165165
# --- Purpose: Statically built binaries and CI environment
166166
### -----------------------
167167

168-
FROM development as builder
168+
FROM development AS builder
169169
WORKDIR /app
170170
COPY Makefile /app/Makefile
171171
COPY --chmod=0755 rksh /app/rksh
@@ -188,7 +188,7 @@ RUN make go-build
188188
# https://github.com/GoogleContainerTools/distroless/blob/master/base/README.md
189189
# The :debug image provides a busybox shell to enter (base-debian10 only, not static).
190190
# https://github.com/GoogleContainerTools/distroless#debug-images
191-
FROM gcr.io/distroless/base-debian12:debug as app
191+
FROM gcr.io/distroless/base-debian12:debug AS app
192192

193193
# FROM debian:buster-slim as app
194194
# RUN apt-get update \

docker-helper.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#!/bin/bash
22

33
if [ "$1" = "--up" ]; then
4-
docker-compose up --no-start
5-
docker-compose start # ensure we are started, handle also allowed to be consumed by vscode
6-
docker-compose exec service bash
4+
docker compose up --no-start
5+
docker compose start # ensure we are started, handle also allowed to be consumed by vscode
6+
docker compose exec service bash
77
fi
88

99
if [ "$1" = "--halt" ]; then
10-
docker-compose stop
10+
docker compose stop
1111
fi
1212

1313
if [ "$1" = "--rebuild" ]; then
14-
docker-compose up -d --force-recreate --no-deps --build service
14+
docker compose up -d --force-recreate --no-deps --build service
1515
fi
1616

1717
if [ "$1" = "--destroy" ]; then
18-
docker-compose down --rmi local -v --remove-orphans
18+
docker compose down --rmi local -v --remove-orphans
1919
fi
2020

2121
[ -n "$1" -a \( "$1" = "--up" -o "$1" = "--halt" -o "$1" = "--rebuild" -o "$1" = "--destroy" \) ] \

0 commit comments

Comments
 (0)