From f15fbb7f11ff95332758bc8b314a8bf7fd7134e3 Mon Sep 17 00:00:00 2001
From: Xueshan Feng <xueshan-feng@stanford.edu>
Date: Wed, 22 Sep 2021 18:29:56 -0700
Subject: [PATCH] Add stanford-server-directory repository.
---
.gitlab-ci.yml | 2 +-
Dockerfile | 19 +++++++++++++++++++
build.sh | 2 +-
env.sh | 3 +--
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7df02b6..c1c9c10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,6 @@ build:
--cache=false
--context $CI_PROJECT_DIR
--dockerfile $CI_PROJECT_DIR/Dockerfile
- --destination $REGISTRY_IMAGE:2.5.7-buster
+ --destination $REGISTRY_IMAGE:2.4.59-buster
--destination $REGISTRY_IMAGE:$CI_COMMIT_SHA
## End of Job
diff --git a/Dockerfile b/Dockerfile
index bd757bd..017eafe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ FROM debian:buster-slim
LABEL maintainer="sfeng@stanford.edu"
ENV DEBIAN_FRONTEND noninteractive
+
RUN apt-get update && \
apt-get install -y -qq \
ca-certificates \
@@ -20,9 +21,27 @@ RUN apt-get update && \
openssl \
lmdb-utils \
krb5-user \
+ gnugpg \
kstart \
procps
+# local apt repos
+RUN apt-get -qq update \
+ && count=0 \
+ && until apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDF37CD4279D4962 || [ $count -eq 5 ]; \
+ do \
+ count=`expr $count + 1`; sleep $count; \
+ done
+
+# Add souces file to find stanford-server-directory package
+ADD etc/apt/sources.list.d/stanford.list /etc/apt/sources.list.d/stanford.list
+ADD etc/apt/sources.list.d/local.list /etc/apt/sources.list.d/local.list
+RUN apt-get update --allow-unauthenticated \
+ && apt-get --assume-yes --allow-unauthenticated install --no-install-recommends \
+ stanford-keyring \
+ libreadonly-perl \
+ stanford-server-directory
+
# Copy software from stage image
COPY --from=builder /artifacts /
diff --git a/build.sh b/build.sh
index af5b7bc..aad1464 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
# Maintainer: sfeng@stanford.edu
-OPENLDAP_VERSION=openldap-2.5.7
+OPENLDAP_VERSION=openldap-2.4.59
CYRUS_SASL_VERSION=cyrus-sasl-2.1.27
OPENLDAP_TARBALL=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${OPENLDAP_VERSION}.tgz
CYRUS_SASL_TARBALL=https://github.com/cyrusimap/cyrus-sasl/releases/download/${CYRUS_SASL_VERSION}/${CYRUS_SASL_VERSION}.tar.gz
diff --git a/env.sh b/env.sh
index dae9c2e..5c093f0 100755
--- a/env.sh
+++ b/env.sh
@@ -8,8 +8,7 @@ export DRONE_SERVER=https://drone.svc.stanford.edu
export DRONE_REPO=authnz/docker-${DOCKER_IMAGE}
export DRONE_SEC_FILE=.drone.sec
export DRONE_REGISTRY_FILE=.drone.reg
-#export DOCKER_IMAGE_VERSION=2.4.58-buster
-export DOCKER_IMAGE_VERSION=2.5.7
+export DOCKER_IMAGE_VERSION=2.4.59-buster
# GitLab configuration
export GITLAB_SERVER=https://code.stanford.edu
--
GitLab