Просмотр исходного кода

have entrypoint kickoff download off texlive images

install script exits without error if auth fails.
Henry Oswald 8 лет назад
Родитель
Сommit
3c2172434b
3 измененных файлов с 15 добавлено и 1 удалено
  1. 1 1
      services/clsi/Makefile
  2. 13 0
      services/clsi/bin/install_texlive_gce.sh
  3. 1 0
      services/clsi/entrypoint.sh

+ 1 - 1
services/clsi/Makefile

@@ -28,11 +28,11 @@ test_acceptance: test_clean # clear the database before each acceptance test run
 
 test_clean:
 	$(DOCKER_COMPOSE) down -t 0
+
 build:
 	docker build --pull --tag quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) .
 
 publish:
 	docker push quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 
-
 .PHONY: clean test test_unit test_acceptance test_clean build publish

+ 13 - 0
services/clsi/bin/install_texlive_gce.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+METADATA=http://metadata.google.internal./computeMetadata/v1
+SVC_ACCT=$METADATA/instance/service-accounts/default
+ACCESS_TOKEN=$(curl -s -H 'Metadata-Flavor: Google' $SVC_ACCT/token | cut -d'"' -f 4)
+if [ -z "$ACCESS_TOKEN" ]; then
+	echo "No acccess token to download texlive-full images from google container, continuing without downloading. This is likely not a google cloud enviroment."
+	exit 0
+fi
+docker login -u '_token' -p $ACCESS_TOKEN https://gcr.io
+docker pull --all-tags gcr.io/henry-terraform-admin/texlive-full #TODO NEED TO MAKE THIS AN ENV VAR
+echo "Finished downloading texlive-full images"
+
+

+ 1 - 0
services/clsi/entrypoint.sh

@@ -2,4 +2,5 @@
 
 echo "Changing permissions of /var/run/docker.sock for sibling containers"
 chown root:docker /var/run/docker.sock
+./bin/install_texlive_gce.sh
 exec runuser -u app "$@"