Commit 14891a4d authored by Vesa Vertainen's avatar Vesa Vertainen

Updated Gitlab version to 12.2.4-ce.0, fixed hardcoded certificate common names, other minor fixes

parent 99b48932
......@@ -19,6 +19,7 @@ The full list of components:
# Prerequisites
* Ubuntu 18.04 (others untested)
* [Docker](https://docs.docker.com/install/) >= 17.12.0
* [Docker Compose](https://docs.docker.com/compose/install/) > 1.17.1
* Ensure that your system has more than 6 GB memory
......@@ -73,17 +74,12 @@ For example, to setup the document-pipeline, follow these setup steps:
1. Set up [the pilot environment](https://gitlab.com/CinCan/environment)
2. sudo bash setup-pipeline.sh pdf-pipeline
2. sudo bash setup-pipeline.sh
3. The script will ask to login and to set up the pipeline to concourse. You can alternatively manually run the commands, see PIPELINE-README.
3. Select the pipeline to set up
4. Login to https://172.20.0.3 to see the pipeline work. (Or https://concourse.cincan.io if proxy is enabled)
4. Login to https://172.20.0.3 to see the pipeline work. (Or https://concourse.cincan.io if proxy is enabled)
2. Type in username and password when prompted.
3. The script will ask to login and to set up the pipeline to concourse. You can alternatively manually run the commands, see PIPELINE-README.
4. Login to https://172.20.0.3 to see the pipeline work (or https://concourse.cincan.io if using dns)
# How to stop and remove the whole pilot environment
......
......@@ -219,6 +219,7 @@ CONCOURSE_POSTGRES_HOST=db
CONCOURSE_POSTGRES_USER=$USER_NAME
CONCOURSE_POSTGRES_PASSWORD=$PASSWORD
CONCOURSE_POSTGRES_DATABASE=$DATABASE
CONCOURSE_POSTGRES_PORT=5432
CONCOURSE_MAIN_TEAM_LOCAL_USER=$USER_NAME
CONCOURSE_ADD_LOCAL_USER=$USER_NAME:$PASSWORD
CONCOURSE_SESSION_SIGNING_KEY=${BUILD_PATH}/keys/session_signing_key
......@@ -254,7 +255,7 @@ cat > "${BUILD_PATH}/build/.env" << EOL
# Image tags
POSTGRES=11.4
CI=${CONCOURSE_VERSION}
GIT=11.9.0-rc7.ce.0
GIT=12.2.4-ce.0
# Volume paths
BUILD=${BUILD_PATH}/build
......@@ -286,7 +287,7 @@ if [ -z "$CC_TLS_PUBKEY" ]; then
-nodes \
-x509 \
-days 365 \
-subj '/CN=concourse.cincan.io/O=CinCan/C=FI' \
-subj '/CN='${COMMON_NAME_CONCOURSE}'/O=CinCan/C=FI' \
-extensions san \
-config <(echo "[req]"; echo distinguished_name=req; echo "[san]"; echo subjectAltName=DNS:"${ALT_EXTERNAL_URL_CONCOURSE}",IP:"${EXTERNAL_URL_CONCOURSE}") \
-sha256 \
......@@ -299,7 +300,7 @@ if [ -z "$CC_TLS_PUBKEY" ]; then
-nodes \
-x509 \
-days 365 \
-subj '/CN=gitlab.cincan.io/O=CinCan/C=FI' \
-subj '/CN='${COMMON_NAME_GITLAB}'/O=CinCan/C=FI' \
-extensions san \
-config <(echo "[req]"; echo distinguished_name=req; echo "[san]"; echo subjectAltName=DNS:"${ALT_EXTERNAL_URL_GITLAB}",IP:"${EXTERNAL_URL_GITLAB}") \
-sha256 \
......
......@@ -40,7 +40,7 @@ PS3="Your choice: "
# Pipeline selection menu
[ "$1" = "" ] &&
echo -e "\nAvailable pipelines: \n$PIPELINES" &&
echo -e "\nAvailable pipelines" &&
i=0 &&
while [ $i -lt "$(echo "$PIPELINES" | wc -l)" ]; do
i=$((i+1))
......
#!/bin/bash
#
# CI test & build script for https://gitlab.com/CinCan/environment/ - if you're an end user, you don't need to worry about this
# Remove previous installation files
ssh "$SSH_REMOTE_SERVER" "rm -rf $REMOTE_FOLDER && mkdir $REMOTE_FOLDER"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment