From ca53ff0e6310a5f48785e7b55722e1f6c291050b Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 7 Aug 2024 02:22:41 +0300
Subject: [PATCH] ci: remove v2 prefix

---
 .gitlab-ci.yml                    |  5 ++---
 Dockerfile                        | 14 +++++++-------
 Dockerfile.v2.ci => Dockerfile.ci |  0
 build-v2.sh => build.sh           |  0
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename Dockerfile.v2.ci => Dockerfile.ci (100%)
 rename build-v2.sh => build.sh (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 952dabcb..6420bf8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,11 @@
 include:
 - project: 'mautrix/ci'
-  file: '/gov2.yml'
+  file: '/gov2-as-default.yml'
 
 variables:
   BUILDER_IMAGE: dock.mau.dev/tulir/gomuks-build-docker/signal
-  BINARY_NAME_V2: mautrix-signal
 
 # 32-bit arm builds aren't supported
-build arm v2:
+build arm:
   rules:
     - when: never
diff --git a/Dockerfile b/Dockerfile
index de716c55..16c7d5b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ ARG DBG=0
 RUN ./build-rust.sh
 
 # -- Build mautrix-signal (with Go) --
-FROM golang:1-alpine3.19 AS go-builder
+FROM golang:1-alpine3.20 AS go-builder
 RUN apk add --no-cache git ca-certificates build-base olm-dev
 
 WORKDIR /build
@@ -20,9 +20,10 @@ COPY *.go go.* *.yaml *.sh ./
 COPY pkg/signalmeow/. pkg/signalmeow/.
 COPY pkg/libsignalgo/* pkg/libsignalgo/
 COPY pkg/libsignalgo/resources/. pkg/libsignalgo/resources/.
-COPY config/. config/.
-COPY database/. database/.
-COPY msgconv/. msgconv/.
+COPY pkg/msgconv/. pkg/msgconv/.
+COPY pkg/signalid/. pkg/signalid/.
+COPY pkg/connector/. pkg/connector/.
+COPY cmd/. cmd/.
 COPY .git .git
 
 ARG DBG=0
@@ -38,15 +39,14 @@ EOF
 RUN ./build-go.sh
 
 # -- Run mautrix-signal --
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV UID=1337 \
     GID=1337
 
-RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq olm
+RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq-go olm
 
 COPY --from=go-builder /build/mautrix-signal /usr/bin/mautrix-signal
-COPY --from=go-builder /build/example-config.yaml /opt/mautrix-signal/example-config.yaml
 COPY --from=go-builder /build/docker-run.sh /docker-run.sh
 COPY --from=go-builder /go/bin/dlv /usr/bin/dlv
 VOLUME /data
diff --git a/Dockerfile.v2.ci b/Dockerfile.ci
similarity index 100%
rename from Dockerfile.v2.ci
rename to Dockerfile.ci
diff --git a/build-v2.sh b/build.sh
similarity index 100%
rename from build-v2.sh
rename to build.sh