Skip to content

Commit

Permalink
Bump Go to 1.22 (#15)
Browse files Browse the repository at this point in the history
Signed-off-by: Guilherme Macedo <[email protected]>
  • Loading branch information
macedogm authored Jun 5, 2024
1 parent 54744f9 commit 467a3f8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 68 deletions.
44 changes: 2 additions & 42 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ platform:
steps:
- name: build
pull: default
image: rancher/dapper:v0.4.1
image: rancher/dapper:v0.6.0
commands:
- dapper ci
volumes:
Expand Down Expand Up @@ -45,7 +45,7 @@ platform:
steps:
- name: build
pull: default
image: rancher/dapper:v0.4.1
image: rancher/dapper:v0.6.0
commands:
- dapper ci
volumes:
Expand All @@ -72,43 +72,3 @@ volumes:
host:
path: /var/run/docker.sock

---
kind: pipeline
name: s390x

platform:
os: linux
arch: amd64

node:
arch: s390x

steps:
- name: build
pull: default
image: rancher/dapper:v0.5.8
commands:
- dapper ci
volumes:
- name: docker
path: /var/run/docker.sock

- name: github_binary_release
image: rancher/drone-images:github-release-s390x
settings:
api_key:
from_secret: github_token
files:
- "dist/artifacts/*"
when:
instance:
- drone-publish.rancher.io
ref:
- refs/head/master
- refs/tags/*
event:
- tag
volumes:
- name: docker
host:
path: /var/run/docker.sock
28 changes: 3 additions & 25 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,32 +1,10 @@
FROM ubuntu:16.04
# FROM arm=armhf/ubuntu:16.04
FROM registry.suse.com/bci/golang:1.22

ARG DAPPER_HOST_ARCH
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}

RUN apt-get update && \
apt-get install -y gcc ca-certificates git wget curl vim less file && \
rm -f /bin/sh && ln -s /bin/bash /bin/sh

ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH_s390x=s390x GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

RUN wget -O - https://storage.googleapis.com/golang/go1.17.5.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get golang.org/x/lint/golint


ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \
DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 \
DOCKER_URL=DOCKER_URL_${ARCH}

RUN if [ "${ARCH}" == "s390x" ]; then \
curl -L https://download.docker.com/linux/static/stable/s390x/docker-18.06.3-ce.tgz | tar xzvf - && \
cp docker/docker /usr/bin/ && \
chmod +x /usr/bin/docker; \
else \
wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker; \
fi
RUN zypper refresh
RUN go install golang.org/x/lint/golint@latest

ENV DAPPER_ENV REPO TAG
ENV DAPPER_SOURCE /go/src/github.com/rancher/loglevel
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module loglevel

go 1.17
go 1.22

require github.com/urfave/cli v1.22.5

Expand Down

0 comments on commit 467a3f8

Please sign in to comment.