From 5b69792607d93322df3a9cd9b0a11af0f8e9d7fd Mon Sep 17 00:00:00 2001
From: tsmethurst <tobi.smethurst@klarrio.com>
Date: Sat, 11 Sep 2021 16:21:24 +0200
Subject: [PATCH 1/2] update container versions

---
 .drone.yml | 10 +++++++---
 Dockerfile |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ec1a6aa85..62daff303 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 ./...
+  - GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" 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: 0a467111d4fc9f8ca92ad4794d9a5aed9a5b0edb0f013d548ee341e4408c1f70
 
 ...
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

From 87e9f06ff7d349e779210bd687a869a92f2964da Mon Sep 17 00:00:00 2001
From: tsmethurst <tobi.smethurst@klarrio.com>
Date: Sat, 11 Sep 2021 16:55:55 +0200
Subject: [PATCH 2/2] disable cgo for tests

---
 .drone.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 62daff303..d8af6a83a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,8 +32,8 @@ steps:
   - name: go-build-cache
     path: /root/.cache/go-build
   commands:
-  - GTS_DB_TYPE="postgres" GTS_DB_ADDRESS="postgres" go test -count 1 -p 1 ./...
-  - GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" 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:
@@ -86,6 +86,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 0a467111d4fc9f8ca92ad4794d9a5aed9a5b0edb0f013d548ee341e4408c1f70
+hmac: 703dad12a9e92cbd415b23d82620608830a60a70168527118e2e9aab145f1099
 
 ...