diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2021-09-12 07:44:18 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-09-12 07:44:18 +0100 |
| commit | 8a18017389bec393239ababc939a93d31ad49b13 (patch) | |
| tree | 2beac9a9a9607180e9efea60015b7177614f7749 | |
| parent | documentation updates (#211) (diff) | |
| parent | disable cgo for tests (diff) | |
| download | gotosocial-8a18017389bec393239ababc939a93d31ad49b13.tar.xz | |
Merge pull request #213 from superseriousbusiness/alpine+node_upstep
update container versions
| -rw-r--r-- | .drone.yml | 12 | ||||
| -rw-r--r-- | Dockerfile | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/.drone.yml b/.drone.yml index ec1a6aa85..d8af6a83a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,13 +27,13 @@ steps: - pull_request - name: test - image: golang:1.17.1 + image: golang:1.17.1-alpine3.14 volumes: - name: go-build-cache path: /root/.cache/go-build commands: - - GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" go test -count 1 -p 1 ./... - - GTS_DB_TYPE="postgres" GTS_DB_ADDRESS="postgres" go test -count 1 -p 1 ./... + - CGO_ENABLED=0 GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" go test -count 1 -p 1 ./... + - CGO_ENABLED=0 GTS_DB_TYPE="postgres" GTS_DB_ADDRESS="postgres" go test -count 1 -p 1 ./... when: event: include: @@ -77,11 +77,15 @@ volumes: trigger: repo: + exclude: + - "*" + include: - superseriousbusiness/gotosocial - NyaaaWhatsUpDoc/gotosocial + - f0x52/gotosocial --- kind: signature -hmac: 764ac2de691c436bd86c6cc94b862cde2b5558e4de65ff68bb0d227de1736783 +hmac: 703dad12a9e92cbd415b23d82620608830a60a70168527118e2e9aab145f1099 ... diff --git a/Dockerfile b/Dockerfile index cb5308c4d..c38f2a610 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # STEP ONE: build the GoToSocial binary -FROM golang:1.17.1-alpine3.13 AS binary_builder +FROM golang:1.17.1-alpine3.14 AS binary_builder RUN apk update && apk upgrade --no-cache RUN apk add git @@ -29,7 +29,7 @@ ADD scripts/build.sh /go/src/github.com/superseriousbusiness/gotosocial/build.sh RUN ./build.sh # STEP TWO: build the web assets -FROM node:16.5.0-alpine3.11 AS web_builder +FROM node:16.9.0-alpine3.14 AS web_builder RUN apk update && apk upgrade --no-cache COPY web /web @@ -39,7 +39,7 @@ RUN yarn install RUN node build.js # STEP THREE: bundle the admin webapp -FROM node:16.5.0-alpine3.11 AS admin_builder +FROM node:16.9.0-alpine3.14 AS admin_builder RUN apk update && apk upgrade --no-cache RUN apk add git @@ -50,7 +50,7 @@ RUN npm install RUN node index.js # STEP FOUR: build the final container -FROM alpine:3.13 AS executor +FROM alpine:3.14.2 AS executor RUN apk update && apk upgrade --no-cache # copy over the binary from the first stage |