Skip to content

Commit 5d2c1e1

Browse files
committed
Nautilus data pipeline fixes
1 parent 4b20d22 commit 5d2c1e1

File tree

5 files changed

+29
-3
lines changed

5 files changed

+29
-3
lines changed

.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
!epf/Dockerfile
1313
!epf/src
1414

15+
!images/experiment/Dockerfile
16+
!images/experiment/src
17+
1518
!nautilus
1619
/nautilus/docker-compose.yml
1720

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ RUN sed -i "/gzip on;/d" /etc/nginx/conf.d/default.conf
225225
# Wrapper to handle additional script to run after default gitlab image's /assets/wrapper
226226
ADD nautilus/assets/ /assets
227227
ADD epf/ /epf
228+
ADD images/ /images
228229

229230
# Export derived env variables from the above defined ENV variables.These should not be directly overwritten.
230231
RUN cat /assets/dynamic-env > /etc/bash.bashrc

images/experiment/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ MAINTAINER MLReef
44
########## MLREEF ##########
55

66
RUN apk add --no-cache \
7-
git \
7+
git \
88
curl \
9-
wget \
9+
wget \
1010
jq
1111

1212
##### ADD files to the image

nautilus/assets/dynamic-env

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ export MLREEF_PG_LOG="/var/log/${MLREEF_PG_CLUSTER}-postgresql"
2525

2626
### Backend dynamic variables created from ENV mentioned in Dockerfile
2727
export EPF_BACKEND_URL=http://localhost:$MLREEF_BACKEND_PORT
28-
export EPF_GITLAB_URL=http://localhost
28+
export EPF_GITLAB_URL=http://localhost:10080
2929

nautilus/assets/mlreef-wrapper

+22
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ getGitlabRunnerRegistrationToken() {
4747
gitlab-rails runner -e production "puts Gitlab::CurrentSettings.current_application_settings.runners_registration_token" | tr -d '\r'
4848
}
4949

50+
# Set max_artifacts_size using api
51+
setMaxArtifactSizeForGitlab() {
52+
curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_ADMIN_TOKEN" "${INSTANCE_HOST}:${GITLAB_PORT}"/"api/v4/application/settings?max_artifacts_size=5120"
53+
}
54+
55+
# Set container_registry_token_expire_delay api
56+
setContainerRegistryTokenExpireDelayForGitlab() {
57+
curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_ADMIN_TOKEN" "${INSTANCE_HOST}:${GITLAB_PORT}"/"api/v4/application/settings?container_registry_token_expire_delay=30"
58+
}
59+
60+
5061
#########################
5162
# Call the Gitlab wrapper
5263
# Gitlab will self-daemonize and run in the background hence no '&' is needed
@@ -69,6 +80,12 @@ log "Expecting code 302; received: $(checkGitlabPort /runners)"
6980
log "Refreshing root user api-token"
7081
recreateGitlabAdminToken
7182

83+
#########################
84+
# Gitlab setting changes
85+
log "Changing gitlab settings"
86+
setMaxArtifactSizeForGitlab
87+
setContainerRegistryTokenExpireDelayForGitlab
88+
7289
log "Getting Gitlab runners registration token from Gitlab."
7390
RUNNER_REGISTRATION_TOKEN=$(getGitlabRunnerRegistrationToken)
7491

@@ -136,11 +153,16 @@ echo "Project Id: $projectId"
136153
export MLREEF_DOCKER_REGISTRY_USER=root
137154
export MLREEF_DOCKER_REGISTRY_IMAGE="${MLREEF_DOCKER_REGISTRY}/${GITLAB_ROOTGROUP}/${GITLAB_PROJECT}"
138155
export MLREEF_DOCKER_REGISTRY_EPF_IMAGE=$MLREEF_DOCKER_REGISTRY_IMAGE/epf:latest
156+
export MLREEF_DOCKER_REGISTRY_EXPERIMENT_IMAGE=$MLREEF_DOCKER_REGISTRY_IMAGE/experiment:latest
139157

140158
if [ -n "${MLREEF_DOCKER_REGISTRY_EXTERNAL_URL+x}" ] && [ -n "${MLREEF_DOCKER_REGISTRY_USER+x}" ] && [ -n "${GITLAB_ADMIN_TOKEN+x}" ]; then
141159
echo "$GITLAB_ADMIN_TOKEN" | docker login "$MLREEF_DOCKER_REGISTRY_EXTERNAL_URL" --username="$MLREEF_DOCKER_REGISTRY_USER" --password-stdin
142160
fi
143161

162+
docker build --tag "$MLREEF_DOCKER_REGISTRY_EXPERIMENT_IMAGE" -f ../images/experiment/Dockerfile ../images/experiment
163+
docker push "$MLREEF_DOCKER_REGISTRY_EXPERIMENT_IMAGE"
164+
log "$MLREEF_DOCKER_REGISTRY_EXPERIMENT_IMAGE has been successfully uploaded "
165+
144166
docker build --tag "$MLREEF_DOCKER_REGISTRY_EPF_IMAGE" -f ../epf/Dockerfile ../epf
145167
docker push "$MLREEF_DOCKER_REGISTRY_EPF_IMAGE"
146168
log "$MLREEF_DOCKER_REGISTRY_EPF_IMAGE has been successfully uploaded "

0 commit comments

Comments
 (0)