Skip to content

Commit

Permalink
Update docker image version (alpine, postgres, go-lang, etc) (#22)
Browse files Browse the repository at this point in the history
Co-authored-by: Mikhail Grigorev <[email protected]>
  • Loading branch information
CHERTS and Mikhail Grigorev authored Jun 24, 2024
1 parent 060f4cb commit 1e2f97c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
jobs:
test:
runs-on: ubuntu-latest
container: cherts/pgscv-test-runner:1.0.0
container: cherts/pgscv-test-runner:1.0.1

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
test:
runs-on: ubuntu-latest
container: cherts/pgscv-test-runner:1.0.0
container: cherts/pgscv-test-runner:1.0.1
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ COPY . .
RUN make build

# stage 2: scratch
# __release_tag__ alpine 3.19.1 was released 2024-01-26
FROM alpine:3.19.1 as dist
# __release_tag__ alpine 3.20.0 was released 2024-05-22
FROM alpine:3.20.0 as dist
COPY --from=build /app/bin/pgscv /bin/pgscv
#COPY docker_entrypoint.sh /bin/
EXPOSE 9890
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dep: ## Get the dependencies

lint: ## Lint the source files
go env -w GOFLAGS="-buildvcs=false"
golangci-lint run --timeout 5m -E golint -e '(struct field|type|method|func) [a-zA-Z`]+ should be [a-zA-Z`]+'
REVIVE_FORCE_COLOR=1 revive -formatter friendly ./...
gosec -quiet ./...

test: dep lint ## Run tests
Expand Down
20 changes: 10 additions & 10 deletions testing/docker-test-runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# cherts/pgscv-test-runner
# __release_tag__ postrges 14.10 was released 2023-11-09
# __release_tag__ golang 1.22 was released 2024-02-06
# __release_tag__ golangci-lint v1.56.0 was released 2024-02-07
# __release_tag__ gosec v2.18.2 was released 2023-10-23
FROM postgres:14.10
# __release_tag__ postrges 14.12 was released 2024-05-09
# __release_tag__ golang 1.22.4 was released 2024-06-04
# __release_tag__ revive v1.3.7 was released 2024-02-07
# __release_tag__ gosec v2.20.0 was released 2024-05-14
FROM postgres:14.12

LABEL version="1.0.0"
LABEL version="1.0.1"

# install dependencies
RUN apt-get update && \
apt-get install -y vim make gcc git curl pgbouncer && \
curl -s -L https://go.dev/dl/go1.22.0.linux-amd64.tar.gz -o - | tar xzf - -C /usr/local && \
curl -s -L https://go.dev/dl/go1.22.4.linux-amd64.tar.gz -o - | tar xzf - -C /usr/local && \
export PATH=$PATH:/usr/local/go/bin && \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOROOT)/bin v1.56.0 && \
curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(go env GOROOT)/bin v2.18.2 && \
curl -s -L https://github.com/mgechev/revive/releases/download/v1.3.7/revive_linux_amd64.tar.gz | tar xzf - -C $(go env GOROOT)/bin revive && \
curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(go env GOROOT)/bin v2.20.0 && \
mkdir /opt/testing/ && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -23,4 +23,4 @@ ENV PATH="${PATH}:/usr/local/bin:/usr/local/go/bin"
COPY prepare-test-environment.sh /usr/bin/
COPY fixtures.sql /opt/testing/

CMD ["echo", "I'm pgscv test runner 1.0.0"]
CMD ["echo", "I'm pgscv test runner 1.0.1"]

0 comments on commit 1e2f97c

Please sign in to comment.