Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update UDI dockerfile to go1.18 #48

Merged
merged 2 commits into from
Dec 8, 2022
Merged

chore: update UDI dockerfile to go1.18 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
039600a
chore: dockerfile update
nickboldt Dec 8, 2022
d60976e
also copy :ubi8-latest to :latest so we can more easily query the rep…
nickboldt Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ubi8-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,5 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
context: universal/ubi8
tags: |
quay.io/devfile/universal-developer-image:latest
${{ steps.meta.outputs.tags }}
2 changes: 1 addition & 1 deletion base/ubi8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.3-labs

# https://registry.access.redhat.com/ubi8
FROM registry.access.redhat.com/ubi8/ubi:8.7-1026
FROM registry.access.redhat.com/ubi8/ubi:8.7
LABEL maintainer="Red Hat, Inc."

LABEL com.redhat.component="devfile-base-container"
Expand Down
17 changes: 9 additions & 8 deletions universal/ubi8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,15 @@ RUN curl -fLo mill https://raw.githubusercontent.com/lefou/millw/main/millw && \
# C/CPP
RUN dnf -y install llvm-toolset gcc gcc-c++ clang clang-libs clang-tools-extra gdb

# Go
RUN dnf install -y go-toolset && \
dnf -y clean all --enablerepo='*' && \
GO111MODULE=on go get -v golang.org/x/tools/gopls@master golang.org/x/tools@master
# Go 1.18+ - installed to /usr/bin/go
# gopls 0.10+ - installed to /home/user/go/bin/gopls and /home/user/go/pkg/mod/
RUN dnf install -y go-toolset && \
GO111MODULE=on go install -v golang.org/x/tools/gopls@latest

# Python
RUN dnf -y module enable python39:3.9 && \
dnf -y update && \
dnf -y install python39 python39-devel python39-setuptools python39-pip nss_wrapper && \
dnf -y clean all --enablerepo='*'
dnf -y install python39 python39-devel python39-setuptools python39-pip nss_wrapper

RUN cd /usr/bin \
&& if [ ! -L python ]; then ln -s python3.9 python; fi \
Expand Down Expand Up @@ -164,8 +163,7 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/clients/oc/${OC_VERSIO
RUN dnf -y module enable container-tools:rhel8 && \
dnf -y update && \
dnf -y reinstall shadow-utils && \
dnf -y install podman buildah skopeo fuse-overlayfs && \
dnf -y clean all --enablerepo='*'
dnf -y install podman buildah skopeo fuse-overlayfs

# Set up environment variables to note that this is
# not starting with usernamespace and default to
Expand Down Expand Up @@ -421,4 +419,7 @@ EOF
# Set permissions on /etc/passwd and /home to allow arbitrary users to write
RUN mkdir -p /home/user && chgrp -R 0 /home && chmod -R g=u /etc/passwd /etc/group /home

# cleanup dnf cache
RUN dnf -y clean all --enablerepo='*'

USER 10001