Skip to content

Commit

Permalink
Merge pull request #213 from superseriousbusiness/alpine+node_upstep
Browse files Browse the repository at this point in the history
update container versions
  • Loading branch information
NyaaaWhatsUpDoc authored Sep 12, 2021
2 parents ab32ce6 + 87e9f06 commit 8a18017
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
12 changes: 8 additions & 4 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -77,11 +77,15 @@ volumes:

trigger:
repo:
exclude:
- "*"
include:
- superseriousbusiness/gotosocial
- NyaaaWhatsUpDoc/gotosocial
- f0x52/gotosocial

---
kind: signature
hmac: 764ac2de691c436bd86c6cc94b862cde2b5558e4de65ff68bb0d227de1736783
hmac: 703dad12a9e92cbd415b23d82620608830a60a70168527118e2e9aab145f1099

...
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 8a18017

Please sign in to comment.