Skip to content

Commit

Permalink
Merge pull request #543 from go-graphite/dzhdanov/gha-typo
Browse files Browse the repository at this point in the history
Fixing typo with go tip, update Docker base images
  • Loading branch information
deniszh committed Feb 21, 2023
2 parents a58531c + 3743a69 commit e8d8b95
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
make sum-files
- name: Upload Artifact
if: ${{ matrix.go == '^1' }} # only upload artifact when built with latest go
if: ${{ matrix.go == 'tip' }} # only upload artifact when built with latest go
id: artifact
uses: actions/upload-artifact@v3
with:
Expand All @@ -85,7 +85,7 @@ jobs:
md5sum
- name: Push packages to the autobuilds repo
if: ${{ github.event_name == 'push' && matrix.go == '^1' }} # only when built from master with latest go
if: ${{ github.event_name == 'push' && matrix.go == 'tip' }} # only when built from master with latest go
run: make DEVEL=1 packagecloud-autobuilds
env:
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.17.4-alpine3.15 AS build
FROM golang:1.20-alpine3.17 AS build

COPY . /usr/local/src/go-carbon
RUN apk add --update git make bash \
&& cd /usr/local/src/go-carbon \
&& make go-carbon \
&& chmod +x go-carbon && cp -fv go-carbon /tmp

FROM alpine:3.15
FROM alpine:3.17

RUN addgroup -S carbon && adduser -S carbon -G carbon \
&& mkdir -p /var/lib/graphite/whisper /var/lib/graphite/dump /var/lib/graphite/tagging /var/log/go-carbon /etc/go-carbon/ \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18
FROM golang:1.20

RUN apt-get update && apt-get install -y \
apt-utils telnet netcat-openbsd net-tools jq lsof less
Expand Down

0 comments on commit e8d8b95

Please sign in to comment.