Fix typos

.gitlab-ci.yml

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

k8s-deployment.yml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: lina-web
-        image: <DOCKER_IMAGE>:<VERSION>
+        image: <SERVER_IMAGE_TAG>
         imagePullPolicy: Always
         ports:
         - containerPort: 3000