Commit 72d909b7 authored by David Mendez's avatar David Mendez
Browse files

Fix typos

parent 32c8d347
...@@ -3,6 +3,7 @@ variables: ...@@ -3,6 +3,7 @@ variables:
GIT_STRATEGY: clone GIT_STRATEGY: clone
REGISTRY_USER: chembl/research REGISTRY_USER: chembl/research
APPLICATION: lina-web APPLICATION: lina-web
SERVER_IMAGE_TAG: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}
RELEASE_IMAGE: $CI_REGISTRY/$REGISTRY_USER/$APPLICATION:$CI_BUILD_REF_NAME RELEASE_IMAGE: $CI_REGISTRY/$REGISTRY_USER/$APPLICATION:$CI_BUILD_REF_NAME
DOCKER_IMAGE: $CI_REGISTRY/$REGISTRY_USER/$APPLICATION DOCKER_IMAGE: $CI_REGISTRY/$REGISTRY_USER/$APPLICATION
DOCKER_DRIVER: overlay DOCKER_DRIVER: overlay
...@@ -38,10 +39,10 @@ build: ...@@ -38,10 +39,10 @@ build:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
script: script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- echo Building ${DOCKER_IMAGE}:${CI_COMMIT_SHORT_SHA} - echo Building ${SERVER_IMAGE_TAG}
- docker-compose build development - echo building ${SERVER_IMAGE_TAG}
- echo Deploying ${DOCKER_IMAGE}:${CI_COMMIT_SHORT_SHA} - docker build --tag ${SERVER_IMAGE_TAG} .
- docker push ${DOCKER_IMAGE}:${CI_COMMIT_SHORT_SHA} - docker push ${SERVER_IMAGE_TAG}
# build-prod: # build-prod:
# image: # image:
...@@ -106,8 +107,7 @@ deploy-staging: ...@@ -106,8 +107,7 @@ deploy-staging:
- cat ${CONFIG_STAGING_FILE_PATH} - cat ${CONFIG_STAGING_FILE_PATH}
- echo ${CHEMBL_NS_STAGING} ${KUBE_URL_HH} ${KUBE_CLUS_NAME_HX} ${KUBE_USER_HX} - echo ${CHEMBL_NS_STAGING} ${KUBE_URL_HH} ${KUBE_CLUS_NAME_HX} ${KUBE_USER_HX}
- kubectl get pods -n ${CHEMBL_NS_STAGING} - kubectl get pods -n ${CHEMBL_NS_STAGING}
- sed -i "s~<VERSION>~${CI_COMMIT_SHORT_SHA}~" k8s-deployment.yml - sed -i "s~<SERVER_IMAGE_TAG>~${SERVER_IMAGE_TAG}~" k8s-deployment.yml
- sed -i "s~<DOCKER_IMAGE>~${DOCKER_IMAGE}~" k8s-deployment.yml
- sed -i "s~<HTTP_PROXY>~${HTTP_PROXY_HX}~g" k8s-deployment.yml - sed -i "s~<HTTP_PROXY>~${HTTP_PROXY_HX}~g" k8s-deployment.yml
- sed -i "s~<HTTPS_PROXY>~${HTTPS_PROXY_HX}~g" k8s-deployment.yml - sed -i "s~<HTTPS_PROXY>~${HTTPS_PROXY_HX}~g" k8s-deployment.yml
- sed -i "s~<NO_PROXY>~${NO_PROXY_HX_DEFAULT}~g" k8s-deployment.yml - sed -i "s~<NO_PROXY>~${NO_PROXY_HX_DEFAULT}~g" k8s-deployment.yml
......
...@@ -20,7 +20,7 @@ spec: ...@@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: lina-web - name: lina-web
image: <DOCKER_IMAGE>:<VERSION> image: <SERVER_IMAGE_TAG>
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 3000 - containerPort: 3000
......
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