Skip to content

Commit 6bad38b

Browse files
committed
eve,manifest: Use python3.6 and explicitly install Go 1.13
- Change buildbot version - Use python3.6 instead of python2 - Install Go 1.13 instead of the one provided by epel (1.15 nowadays)
1 parent c568743 commit 6bad38b

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

eve/workers/pod-builder/Dockerfile

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
FROM centos:7
22

3-
ARG BUILDBOT_VERSION=0.9.12
3+
ARG BUILDBOT_VERSION=2.0.1
4+
ARG GO_VERSION=1.13.10
45
ARG OPERATOR_SDK_VERSION=v0.17.0
56

7+
ENV LANG=en_US.utf8
8+
69
WORKDIR /home/eve/workspace
710

811
RUN yum install -y --setopt=skip_missing_names_on_install=False \
912
epel-release \
10-
https://repo.ius.io/ius-release-el7.rpm \
1113
&& yum-config-manager --add-repo \
1214
https://download.docker.com/linux/centos/docker-ce.repo \
1315
&& yum install -y --setopt=skip_missing_names_on_install=False \
@@ -16,23 +18,32 @@ RUN yum install -y --setopt=skip_missing_names_on_install=False \
1618
hardlink \
1719
make \
1820
genisoimage \
19-
golang \
20-
python-devel \
21-
python-pip \
21+
python36 \
22+
python36-devel \
23+
python36-pip \
2224
skopeo \
2325
yum-utils \
2426
docker-ce-cli-18.09.6 \
25-
git224 \
26-
&& curl -LO https://github.com/operator-framework/operator-sdk/releases/download/$OPERATOR_SDK_VERSION/operator-sdk-$OPERATOR_SDK_VERSION-x86_64-linux-gnu \
27-
&& chmod +x operator-sdk-$OPERATOR_SDK_VERSION-x86_64-linux-gnu \
28-
&& mkdir -p /usr/local/bin/ \
29-
&& mv operator-sdk-$OPERATOR_SDK_VERSION-x86_64-linux-gnu /usr/local/bin/operator-sdk \
27+
git \
3028
&& adduser -u 1042 --home /home/eve eve --groups docker \
31-
&& mkdir -p /home/eve/.cache /home/eve/go \
32-
&& chown eve:eve /home/eve/workspace /home/eve/.cache /home/eve/go \
33-
&& pip install buildbot-worker==${BUILDBOT_VERSION} pyyaml
29+
&& chown eve:eve /home/eve \
30+
&& python3.6 -m pip install buildbot-worker==${BUILDBOT_VERSION} pyyaml
3431

3532
# Add eve to sudoers.
3633
RUN echo "eve ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/eve
3734

35+
# Install Go tooling to build the Kubernetes Operators.
36+
ENV GOROOT /usr/local/go
37+
ENV GOPATH /home/eve/.golang
38+
ENV GOCACHE /home/eve/.cache
39+
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
40+
41+
RUN curl -ORL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz \
42+
&& tar xzvf go${GO_VERSION}.linux-amd64.tar.gz \
43+
&& rm go${GO_VERSION}.linux-amd64.tar.gz \
44+
&& mv go /usr/local \
45+
&& curl -RLo /usr/bin/operator-sdk \
46+
https://github.com/operator-framework/operator-sdk/releases/download/${OPERATOR_SDK_VERSION}/operator-sdk-${OPERATOR_SDK_VERSION}-x86_64-linux-gnu \
47+
&& chmod +x /usr/bin/operator-sdk
48+
3849
USER eve

manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
"""Utility script to generate a Solution manifest from given arguments."""
44

0 commit comments

Comments
 (0)