Simplify Dockerfile, fix Drone secret names
continuous-integration/drone/push Build is failing Details

This commit is contained in:
3wc 2021-04-24 19:06:53 +02:00
parent 839675d12e
commit 719697d26b
5 changed files with 10 additions and 18 deletions

View File

@ -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

View File

@ -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"]

View File

@ -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:

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "our-elm-spa-app",
"name": "abra-apps",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,

View File

@ -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",