Skip to content

Commit

Permalink
fix: bump go version for docker files (#3817)
Browse files Browse the repository at this point in the history
Co-authored-by: Pantani <Pantani>
  • Loading branch information
Pantani authored Dec 6, 2023
1 parent ab9486a commit 6abc7bd
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 64 deletions.
122 changes: 61 additions & 61 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
#name: Release Docker Image

#on:
#release:
#types: [ published ]
#push:
#branches:
#- main

#concurrency:
#group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
#cancel-in-progress: true

#jobs:
#consecutiveness:
#runs-on: ubuntu-latest
#steps:
#- uses: ignite/consecutive-workflow-action@main
#with:
#token: ${{ secrets.GITHUB_TOKEN }}

#docker:
#name: Push Docker image to Docker Hub
#runs-on: ubuntu-latest
#needs: [ consecutiveness ]

#steps:
#- name: Check out the repo
#uses: actions/checkout@v3

#- name: Set up QEMU
#uses: docker/setup-qemu-action@v1

#- name: Set up Docker Buildx
#uses: docker/setup-buildx-action@v1

#- name: Login to DockerHub
#uses: docker/login-action@v2
#with:
#username: ${{ secrets.DOCKERHUB_USERNAME }}
#password: ${{ secrets.DOCKERHUB_TOKEN }}

#- name: Docker meta
#id: meta
#uses: docker/metadata-action@v4
#with:
#images: ignitehq/cli
## push to ignitehq/cli:latest on every push to master
## push to ignitehq/cli:vx.x.x on every release published
#tags: |
#type=raw,value=latest
#type=semver,pattern=v{{version}}

#- name: Build and push
#uses: docker/build-push-action@v3
#with:
#push: true
#context: .
#platforms: linux/amd64,linux/arm64
#tags: ${{ steps.meta.outputs.tags }}
#labels: ${{ steps.meta.outputs.labels }}
name: Release Docker Image

on:
release:
types: [ published ]
push:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
consecutiveness:
runs-on: ubuntu-latest
steps:
- uses: ignite/consecutive-workflow-action@main
with:
token: ${{ secrets.GITHUB_TOKEN }}

docker:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
needs: [ consecutiveness ]

steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: ignitehq/cli
# push to ignitehq/cli:latest on every push to master
# push to ignitehq/cli:vx.x.x on every release published
tags: |
type=raw,value=latest
type=semver,pattern=v{{version}}
- name: Build and push
uses: docker/build-push-action@v3
with:
push: true
context: .
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM gitpod/workspace-full

# Go
ENV GO_VERSION=1.20.5
ENV GO_VERSION=1.21.5
ENV GOPATH=$HOME/go-packages
ENV GOROOT=$HOME/go
ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## prep the base image.
#
FROM golang:1.20 as base
FROM golang:1.21.5 as base

RUN apt update && \
apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion scripts/indocker
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
function build {
echo "building container..."
docker build -t ignite-cli -f - > /dev/null . << EOF
FROM golang:1.16.2-buster
FROM golang:1.21.5
WORKDIR /apps
Expand Down

0 comments on commit 6abc7bd

Please sign in to comment.