change user-scalable

prod deploy
test vars
2020-04-25 19:28:56 -04:00 · 2020-04-25 19:17:52 -04:00 · 2020-04-25 19:11:27 -04:00
2 changed files with 6 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,6 @@
 variables:
  CI_PROJECT_DIR: "."
  CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/mysite
-  DEPLOY_TEST: test
-  DEPLOY_PROD: prod

 stages:
  - build
@@ -18,6 +16,7 @@ build:
    name: gcr.io/kaniko-project/executor:debug
    entrypoint: [""]
  script:
+    - echo $DEPLOY
    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG

 test:
@@ -32,6 +31,8 @@ test:
    - python manage.py test

 deploy_to_test:
+  variables:
+    DEPLOY: test
  stage: deploy
  only:
    variables:
@@ -52,6 +53,8 @@ deploy_to_test:
    - ./kubectl exec $POD -- python manage.py migrate

 deploy_to_prod:
+  variables:
+    DEPLOY: prod
  stage: deploy
  only:
    variables:
--- a/ui/templates/ui/base.html
+++ b/ui/templates/ui/base.html
@@ -5,7 +5,7 @@

 <head>
    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=1">
+    <meta name="viewport" content= "width=device-width, user-scalable=no">
    <title>The Button</title>
    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.2/css/bulma.min.css">
    <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
Author	SHA1	Message	Date
ducoterra	c80ef7441d	change user-scalable	2020-04-25 19:28:56 -04:00
ducoterra	a2e7a92280	prod deploy	2020-04-25 19:17:52 -04:00
ducoterra	b4ef050e1f	test vars	2020-04-25 19:11:27 -04:00