Simplify Dockerfile, fix Drone secret names
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
839675d12e
commit
719697d26b
|
@ -6,9 +6,9 @@ steps:
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
username:
|
username:
|
||||||
from_secret: docker_reg_username
|
from_secret: docker_reg_username_3wc
|
||||||
password:
|
password:
|
||||||
from_secret: docker_reg_passwd
|
from_secret: docker_reg_passwd_3wc
|
||||||
repo: 3wordchant/abra-apps
|
repo: 3wordchant/abra-apps
|
||||||
tags: latest
|
tags: latest
|
||||||
|
|
||||||
|
|
13
Dockerfile
13
Dockerfile
|
@ -3,22 +3,13 @@ FROM node:12-alpine
|
||||||
RUN mkdir /code
|
RUN mkdir /code
|
||||||
WORKDIR /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/
|
COPY package*.json /code/
|
||||||
|
|
||||||
# Install elm-analyse, elm linter, and elm test
|
|
||||||
RUN npm install
|
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
|
# Add remainder of files
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/npm"]
|
ENTRYPOINT ["/usr/local/bin/npm"]
|
||||||
|
CMD ["run", "prod"]
|
||||||
|
|
|
@ -18,10 +18,10 @@ services:
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.services.mkdocs.loadbalancer.server.port=8000"
|
- "traefik.http.services.abra-apps-dev.loadbalancer.server.port=8000"
|
||||||
- "traefik.http.routers.mkdocs.rule=Host(`dev.apps.coopcloud.tecg`)"
|
- "traefik.http.routers.abra-apps-dev.rule=Host(`dev.apps.coopcloud.tech`)"
|
||||||
- "traefik.http.routers.mkdocs.entrypoints=web-secure"
|
- "traefik.http.routers.abra-apps-dev.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.mkdocs.tls.certresolver=production"
|
- "traefik.http.routers.abra-apps-dev.tls.certresolver=production"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "our-elm-spa-app",
|
"name": "abra-apps",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
"name": "abra-apps",
|
"name": "abra-apps",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "Co-op Cloud app catalogue",
|
"description": "Co-op Cloud app catalogue",
|
||||||
|
"repository": "https://git.autonomic.zone/coop-cloud/abra-apps",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "npm install && npm run build:dev && npm run dev",
|
"start": "npm install && npm run build:dev && npm run dev",
|
||||||
"prod": "npm install && npm run build && npm run serve",
|
"prod": "npm install && npm run build && npm run serve",
|
||||||
|
|
Loading…
Reference in New Issue