commit 8a18017389bec393239ababc939a93d31ad49b13
parent ab32ce642bfa56414b88fbb760ea1857636226a6
Author: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Sun, 12 Sep 2021 07:44:18 +0100
Merge pull request #213 from superseriousbusiness/alpine+node_upstep
update container versions
Diffstat:
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git 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
@@ -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