Skip to content

Commit 8999fed

Browse files
authored
Merge pull request #243 from MStokluska/circle-ci-images-2025
Update base image to registry and update CI configuration to use quay images
2 parents 8ced89e + 171ac48 commit 8999fed

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

.circleci/config.yml

+28-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ commands:
3434
jobs:
3535
install-operator:
3636
docker:
37-
- image: cimg/go:1.20
37+
- image: quay.io/3scale/operators-ci-images:v1.20
3838
steps:
3939
- setup_remote_docker:
4040
docker_layer_caching: true
@@ -51,12 +51,30 @@ jobs:
5151

5252
license-check:
5353
docker:
54-
- image: circleci/ruby:2.6
54+
- image: quay.io/3scale/operators-ci-images:v1.20
5555
steps:
56-
- go/install:
57-
version: '1.20.14'
56+
- run:
57+
name: Installing ruby
58+
command: |
59+
# Determine if sudo is neccessary
60+
SUDO=""
61+
if [[ $EUID -ne 0 ]]; then
62+
SUDO=sudo
63+
fi
64+
# Install ruby
65+
$SUDO apt-get update --allow-releaseinfo-change && $SUDO apt-get install -y ruby-full
66+
- run:
67+
name: Installing License tool
68+
command: |
69+
# Determine if sudo is neccessary
70+
SUDO=""
71+
if [[ $EUID -ne 0 ]]; then
72+
SUDO=sudo
73+
fi
74+
# Install ruby
75+
$SUDO gem install license_finder --version 5.7.1
5876
- checkout
59-
- run: sudo gem install license_finder --version 5.7.1
77+
- run: make download
6078
- run: make licenses-check
6179

6280
tag-operator-image-master:
@@ -109,13 +127,14 @@ jobs:
109127
110128
run-unit-test:
111129
docker:
112-
- image: cimg/go:1.20
130+
- image: quay.io/3scale/operators-ci-images:v1.20
113131
steps:
114132
- checkout
115133
- run:
116134
name: run unit tests
117135
command: |
118136
make test-unit
137+
119138
run-integration-test:
120139
machine:
121140
image: ubuntu-2404:current
@@ -137,9 +156,10 @@ jobs:
137156
command: |
138157
make test-integration
139158
no_output_timeout: 30m
159+
140160
lint:
141161
docker:
142-
- image: cimg/go:1.20
162+
- image: quay.io/3scale/operators-ci-images:v1.20
143163
steps:
144164
- checkout
145165
- run:
@@ -149,7 +169,7 @@ jobs:
149169
150170
bundle-validate:
151171
docker:
152-
- image: cimg/go:1.20
172+
- image: quay.io/3scale/operators-ci-images:v1.20
153173
steps:
154174
- checkout
155175
- run: make bundle

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.20 as builder
2+
FROM registry.access.redhat.com/ubi9/go-toolset:1.20.12 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

0 commit comments

Comments
 (0)