From 76a303e649def4d45a2da5447f9987a8a04d06fc Mon Sep 17 00:00:00 2001
From: Philip Offtermatt
Date: Wed, 26 Jul 2023 19:38:09 +0200
Subject: [PATCH 1/2] Add versioned branches to docker publish
---
.github/workflows/docker-publish.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 34959e3..3a55d56 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -9,7 +9,7 @@ on:
schedule:
- cron: '38 20 * * *'
push:
- branches: [ "main" ]
+ branches: [ "main", "v0.37.x", "v0.34.x" ]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]
pull_request:
From 2c310b7a391a68eecc595944a875b5d463d97855 Mon Sep 17 00:00:00 2001
From: Philip Offtermatt <57488781+p-offtermatt@users.noreply.github.com>
Date: Thu, 27 Jul 2023 11:59:46 +0200
Subject: [PATCH 2/2] Update Dockerfile
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b6449bd..78ae1b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine
+FROM golang:1.20-alpine
ENV PACKAGES curl make git libc-dev bash gcc linux-headers
RUN apk add --no-cache $PACKAGES
@@ -15,4 +15,4 @@ RUN go mod download
# Add CometMock and install it
ADD . /CometMock
WORKDIR /CometMock
-RUN go build -o /usr/local/bin/cometmock ./cometmock
\ No newline at end of file
+RUN go build -o /usr/local/bin/cometmock ./cometmock