Hmmm. More trouble with secrets

.drone.yml

@@ -1,74 +1,73 @@
-kind: pipeline
+# kind: pipeline
-type: docker
+# type: docker
-name: Test Pipeline
+# name: Test Pipeline
 
-workspace:
+# workspace:
-  path: /drone/grow
+#   path: /drone/grow
 
-steps:
+# steps:
-- name: yarn install
+# - name: yarn install
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn install
+#   - yarn install
-- name: Code Style Checks
+# - name: Code Style Checks
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn prettier
+#   - yarn prettier
-- name: Lint
+# - name: Lint
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn lint
+#   - yarn lint
-- name: Unit Tests
+# - name: Unit Tests
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn test
+#   - yarn test
-- name: Send Test Status Notification
+# - name: Send Test Status Notification
-  image: plugins/webhook
+#   image: plugins/webhook
-  settings:
+#   settings:
-    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-    content_type: application/json
+#     content_type: application/json
-    template: |
+#     template: |
-      {
+#       {
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-        "username":"DroneBot"
+#         "username":"DroneBot"
-      }
+#       }
-  when:
+#   when:
-    status:
+#     status:
-      - success
+#       - success
-      - failure
+#       - failure
-- name: Build
+# - name: Build
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn build
+#   - yarn build
-- name: Send Build Status Notifications
+# - name: Send Build Status Notifications
-  image: plugins/webhook
+#   image: plugins/webhook
-  settings:
+#   settings:
-    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-    content_type: application/json
+#     content_type: application/json
-    template: |
+#     template: |
-      {
+#       {
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-        "username":"DroneBot"
+#         "username":"DroneBot"
-      }
+#       }
-  when:
+#   when:
-    status:
+#     status:
-      - success
+#       - success
-      - failure
+#       - failure
 
-trigger:
+# trigger:
-  branch:
+#   branch:
-  - main
+#   - main
-  event:
+#   event:
-  # - pull_request
+#   # - pull_request
-  - push
+#   - push
 
----
+# ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
-group: publish
 
 workspace:
   path: /drone/grow
@@ -110,39 +109,20 @@ steps:
       - failure
 - name: Publish Image
   image: docker
-  environment:
+  environemnt:
     USERNAME:
       from_secret: registry_username
     PASSWORD:
       from_secret: registry_password
   commands:
-    - docker login -u ${USERNAME} -p {PASSWORD} git.mifi.dev
+    - 'docker login git.mifi.dev'
-    - docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .
+    - 'docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .'
     - docker push git.mifi.dev/mifi/mifi/auth:latest
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
     path: /drone/grow/.docker/config.json
-# - name: Publish Image
-#   image: plugins/docker
-#   settings:
-#     auto_tag: true
-#     squash: true
-#     repo: git.mifi.dev/mifi/auth
-#     context: mifi
-#     registry: git.mifi.dev
-#     username:
-#       from_secret: registry_username
-#     password:
-#       from_secret: registry_password
-#     ssh-agent-key:
-#       from_secret: gitea_token
-  volumes:
-  - name: dockersock
-    path: /var/run/docker.sock
-  - name: dockerconfig
-    path: /drone/grow/.docker/config.json
 - name: Report Image Publish Status
   image: plugins/webhook
   settings:
@@ -170,74 +150,79 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/.npmrc
 
-depends_on:
+# depends_on:
-  - Test Pipeline
+#   - Test Pipeline
 
 trigger:
+  branch:
+  - main
+  event:
+  - push
+  # - tag
+
+# ---
+# kind: pipeline
+# type: docker
+# name: Deploy Pipeline
+
+# workspace:
+#   path: /drone/grow
+
+# steps:
+# - name: Deploy Container
+#   image: docker
+#   privileged: true
+#   environment:
+#     CONTAINER_PREFIX: staging
+#     HOST: area51.mifi.dev
+#     ROUTE_PREFIX: /auth
+#     PORT: 9001
+#   commands:
+#     - docker compose -f docker-compose.staging.yml pull
+#     - docker compose -f docker-compose.staging.yml build --no-cache
+#     - docker compose -f docker-compose.staging.yml rm --stop
+#     - docker compose -f docker-compose.staging.yml up --wait
+#   volumes:
+#   - name: env-secrets
+#     path: /drone/grow/staging.env
+#   - name: dockersock
+#     path: /var/run/docker.sock
+#   - name: dockerconfig
+#     path: /drone/grow/.docker/config.json
+# - name: Send Status Notifications
+#   image: plugins/webhook
+#   privileged: true
+#   settings:
+#     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+#     content_type: application/json
+#     template: |
+#       {
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#         "username":"DroneBot"
+#       }
+#   when:
+#     status:
+#       - success
+#       - failure
+
+# volumes:
+# - name: dockerconfig
+#   host:
+#     path: /volume1/docker/dockerconfig.json
+# - name: dockersock
+#   host:
+#     path: /var/run/docker.sock
+# - name: env-secrets
+#   host:
+#     path: /volume1/docker/beethoven/labs-auth/staging.env
+
+# # depends_on:
+# #   - Test Pipeline
+
+# trigger:
 #   branch:
 #   - main
-  event:
+#   event:
 #   - push
-  - tag
+#   # - tag
-
----
-kind: pipeline
-type: docker
-name: Deploy Pipeline
-
-workspace:
-  path: /drone/grow
-
-steps:
-- name: Deploy Container
-  image: docker
-  privileged: true
-  commands:
-    - docker compose -f docker-compose.staging.yml pull
-    - docker compose -f docker-compose.staging.yml build --no-cache
-    - docker compose -f docker-compose.staging.yml rm --stop
-    - docker compose -f docker-compose.staging.yml up --wait
-  volumes:
-  - name: env-secrets
-    path: /drone/grow/staging.secrets.env
-  - name: dockersock
-    path: /var/run/docker.sock
-  - name: dockerconfig
-    path: /drone/grow/.docker/config.json
-- name: Send Status Notifications
-  image: plugins/webhook
-  privileged: true
-  settings:
-    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
-    content_type: application/json
-    template: |
-      {
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - Build # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-        "username":"DroneBot"
-      }
-  when:
-    status:
-      - success
-      - failure
-
-volumes:
-- name: dockerconfig
-  host:
-    path: /volume1/docker/dockerconfig.json
-- name: dockersock
-  host:
-    path: /var/run/docker.sock
-- name: env-secrets
-  host:
-    path: /volume1/docker/beethoven/labs-auth/staging.secrets.env
-
-depends_on:
-  - Test Pipeline
-
-trigger:
-  # branch:
-  # - main
-  event:
-  # - push
-  - tag

.env.staging

@@ -1,6 +0,0 @@
-HOST=area51.mifi.dev
-PORT=9001
-
-ROUTE_PREFIX=/auth
-
-CONTAINER_PREFIX=mifi

docker-compose.dev.yml

@@ -3,6 +3,9 @@ version: '3.8'
 services:
     auth-service_mongo:
         env_file: .env.dev
+        build:
+            args:
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
@@ -15,7 +18,13 @@ services:
         image: mongo:latest
     auth-service:
         env_file: .env.dev
-        build: .
+        build:
+            context: .
+            args:
+              - HOST=${HOST}
+              - PORT=${PORT}
+              - ROUTE_PREFIX=${ROUTE_PREFIX}
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
             - 9001:9001

docker-compose.staging.yml

@@ -2,10 +2,9 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: $${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         env_file:
-            - .env.staging
+            - staging.env
-            - staging.secrets.env
         networks:
             - docknet
         volumes:
@@ -14,20 +13,17 @@ services:
         image: mongo:latest
     auth-service:
         env_file:
-            - .env.staging
+            - staging.env
-            - staging.secrets.env
         build: .
-        container_name: $${CONTAINER_PREFIX:-mifi}-auth-service
+        container_name: ${CONTAINER_PREFIX}-auth-service
-        environment:
-            - DB_HOST=$${CONTAINER_PREFIX:-mifi}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`$${HOST}`) && Path(`$${ROUTE_PREFIX}`)'
+            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
             - 'traefik.http.routers.grow.entrypoints=websecure'
             - 'traefik.http.routers.grow.tls=true'
             - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
             - 'traefik.http.routers.grow.service=grow-service'
-            - 'traefik.http.services.grow-service.loadbalancer.server.port=$${PORT}'
+            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
         networks:
             - docknet
         restart: unless-stopped

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {