From 29981a5ddf6788abd92b995bc24b99c966cb8514 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Fri, 9 Apr 2021 13:33:56 +0200
Subject: [PATCH 1/5] Add Dockerfile
---
Dockerfile | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ca4c006
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM frolvlad/alpine-glibc:latest
+
+LABEL maintainer="Drupal Admins <drupal-admins@cern.ch>"
+
+ARG OC_VERSION=4.5
+ARG BUILD_DEPS='tar gzip'
+ARG RUN_DEPS='curl ca-certificates gettext'
+
+RUN apk --no-cache add $BUILD_DEPS $RUN_DEPS && \
+ curl -sLo /tmp/oc.tar.gz https://mirror.openshift.com/pub/openshift-v$(echo $OC_VERSION | cut -d'.' -f 1)/clients/oc/$OC_VERSION/linux/oc.tar.gz && \
+ tar xzvf /tmp/oc.tar.gz -C /usr/local/bin/ && \
+ rm -rf /tmp/oc.tar.gz && \
+ apk del $BUILD_DEPS
+
+CMD ["/usr/local/bin/oc"]
\ No newline at end of file
--
GitLab
From ee03fe86bb10de8135ee2a70d59fe0336ec87241 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Fri, 9 Apr 2021 13:34:12 +0200
Subject: [PATCH 2/5] Add gitlab-ci
---
.gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f65ccfb
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,39 @@
+stages:
+ - build
+
+.build:
+ stage: build
+ variables:
+ IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}:latest
+ image:
+ name: gitlab-registry.cern.ch/ci-tools/docker-image-builder
+ entrypoint: [""]
+ script:
+ - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+ - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $IMAGE_DESTINATION
+ - echo "Image pushed successfully to ${IMAGE_DESTINATION}"
+
+
+#####################################################
+################### Merge Requests ##################
+
+build_mr:
+ extends: .build
+ variables:
+ IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:${CI_COMMIT_REF_SLUG}
+ rules:
+ - if: $CI_MERGE_REQUEST_ID
+ when: manual
+ allow_failure: true
+ - when: never
+
+######################################################
+#################### Master branch ###################
+
+build_master:
+ extends: .build
+ variables:
+ IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:${CI_COMMIT_SHORT_SHA}
+ rules:
+ - if: $CI_COMMIT_BRANCH == 'master'
+ - when: never
\ No newline at end of file
--
GitLab
From fab44ebd424c6d03c323cf6d9b8557ef5bd91255 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Fri, 9 Apr 2021 13:36:31 +0200
Subject: [PATCH 3/5] Add new line at the end of teh file
---
.gitlab-ci.yml | 2 +-
Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f65ccfb..929fb7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,4 +36,4 @@ build_master:
IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:${CI_COMMIT_SHORT_SHA}
rules:
- if: $CI_COMMIT_BRANCH == 'master'
- - when: never
\ No newline at end of file
+ - when: never
diff --git a/Dockerfile b/Dockerfile
index ca4c006..63f053d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,4 +12,4 @@ RUN apk --no-cache add $BUILD_DEPS $RUN_DEPS && \
rm -rf /tmp/oc.tar.gz && \
apk del $BUILD_DEPS
-CMD ["/usr/local/bin/oc"]
\ No newline at end of file
+CMD ["/usr/local/bin/oc"]
--
GitLab
From 95751597dbd411f89f118f91534473546ec69ee9 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Fri, 9 Apr 2021 15:31:43 +0200
Subject: [PATCH 4/5] Apply suggestions
---
.gitlab-ci.yml | 4 +---
Dockerfile | 7 +++++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 929fb7f..c48d792 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,6 @@ stages:
.build:
stage: build
- variables:
- IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}:latest
image:
name: gitlab-registry.cern.ch/ci-tools/docker-image-builder
entrypoint: [""]
@@ -33,7 +31,7 @@ build_mr:
build_master:
extends: .build
variables:
- IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:${CI_COMMIT_SHORT_SHA}
+ IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:latest
rules:
- if: $CI_COMMIT_BRANCH == 'master'
- when: never
diff --git a/Dockerfile b/Dockerfile
index 63f053d..03d6520 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,16 @@
+# Base image: https://github.com/Docker-Hub-frolvlad/docker-alpine-glibc
+# This image makes glibc work side by side with musl libc
FROM frolvlad/alpine-glibc:latest
LABEL maintainer="Drupal Admins <drupal-admins@cern.ch>"
-ARG OC_VERSION=4.5
+ARG OC_STABLE_VERSION=stable-4.7
+ARG OC_LATEST_VERSION=4.7.5
ARG BUILD_DEPS='tar gzip'
ARG RUN_DEPS='curl ca-certificates gettext'
RUN apk --no-cache add $BUILD_DEPS $RUN_DEPS && \
- curl -sLo /tmp/oc.tar.gz https://mirror.openshift.com/pub/openshift-v$(echo $OC_VERSION | cut -d'.' -f 1)/clients/oc/$OC_VERSION/linux/oc.tar.gz && \
+ curl -sLo /tmp/oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$OC_STABLE_VERSION/openshift-client-linux-$OC_LATEST_VERSION.tar.gz && \
tar xzvf /tmp/oc.tar.gz -C /usr/local/bin/ && \
rm -rf /tmp/oc.tar.gz && \
apk del $BUILD_DEPS
--
GitLab
From ea4c9a1d0a65fd0a934be4839fc10e77dd0988d8 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Fri, 9 Apr 2021 16:22:38 +0200
Subject: [PATCH 5/5] Use stable version for oc client
---
Dockerfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 03d6520..f352bbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,11 @@ FROM frolvlad/alpine-glibc:latest
LABEL maintainer="Drupal Admins <drupal-admins@cern.ch>"
-ARG OC_STABLE_VERSION=stable-4.7
-ARG OC_LATEST_VERSION=4.7.5
ARG BUILD_DEPS='tar gzip'
ARG RUN_DEPS='curl ca-certificates gettext'
RUN apk --no-cache add $BUILD_DEPS $RUN_DEPS && \
- curl -sLo /tmp/oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$OC_STABLE_VERSION/openshift-client-linux-$OC_LATEST_VERSION.tar.gz && \
+ curl -sLo /tmp/oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz && \
tar xzvf /tmp/oc.tar.gz -C /usr/local/bin/ && \
rm -rf /tmp/oc.tar.gz && \
apk del $BUILD_DEPS
--
GitLab