From 719697d26b23cac5fdc51be86ae8f09ac2ce5057 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sat, 24 Apr 2021 19:06:53 +0200
Subject: [PATCH] Simplify Dockerfile, fix Drone secret names

---
 .drone.yml        |  4 ++--
 Dockerfile        | 13 ++-----------
 compose.yml       |  8 ++++----
 package-lock.json |  2 +-
 package.json      |  1 +
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2edfc84..1a22ed6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,9 +6,9 @@ steps:
     image: plugins/docker
     settings:
       username:
-        from_secret: docker_reg_username
+        from_secret: docker_reg_username_3wc
       password:
-        from_secret: docker_reg_passwd
+        from_secret: docker_reg_passwd_3wc
       repo: 3wordchant/abra-apps
       tags: latest
 
diff --git a/Dockerfile b/Dockerfile
index 4f62cf3..53f37b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,22 +3,13 @@ FROM node:12-alpine
 RUN mkdir /code
 WORKDIR /code
 
-RUN apk add curl gzip \
-    --virtual .build-dependencies
-
-# Install and cache dependencies
-RUN curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz && \
-    gunzip elm.gz && \
-    chmod +x elm && \
-    mv elm /usr/local/bin/
-
 COPY package*.json /code/
 
-# Install elm-analyse, elm linter, and elm test
 RUN npm install
-ENV PATH=$PATH:/code/node_modules/elm-linter/bin:/code/node_modules/elm-format/bin:/code/node_modules/elm-test/bin
+ENV PATH=$PATH:/code/node_modules/elm-linter/bin:/code/node_modules/elm-format/bin:/code/node_modules/elm-test/bin:/code/node_modules/elm/bin
 
 # Add remainder of files
 COPY . .
 
 ENTRYPOINT ["/usr/local/bin/npm"]
+CMD ["run", "prod"]
diff --git a/compose.yml b/compose.yml
index 41c8f44..2094a64 100644
--- a/compose.yml
+++ b/compose.yml
@@ -18,10 +18,10 @@ services:
         order: start-first
       labels:
         - "traefik.enable=true"
-        - "traefik.http.services.mkdocs.loadbalancer.server.port=8000"
-        - "traefik.http.routers.mkdocs.rule=Host(`dev.apps.coopcloud.tecg`)"
-        - "traefik.http.routers.mkdocs.entrypoints=web-secure"
-        - "traefik.http.routers.mkdocs.tls.certresolver=production"
+        - "traefik.http.services.abra-apps-dev.loadbalancer.server.port=8000"
+        - "traefik.http.routers.abra-apps-dev.rule=Host(`dev.apps.coopcloud.tech`)"
+        - "traefik.http.routers.abra-apps-dev.entrypoints=web-secure"
+        - "traefik.http.routers.abra-apps-dev.tls.certresolver=production"
 
 networks:
   proxy:
diff --git a/package-lock.json b/package-lock.json
index 594cdd5..785f446 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "our-elm-spa-app",
+  "name": "abra-apps",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/package.json b/package.json
index dede102..5f476a4 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "abra-apps",
   "version": "1.0.0",
   "description": "Co-op Cloud app catalogue",
+  "repository": "https://git.autonomic.zone/coop-cloud/abra-apps",
   "scripts": {
     "start": "npm install && npm run build:dev && npm run dev",
     "prod": "npm install && npm run build && npm run serve",