This commit is contained in:
parent
7c17a1cf09
commit
7ddcb1b83f
|
@ -1,32 +1,29 @@
|
||||||
FROM node:20-bullseye AS base
|
FROM docker:dind AS base
|
||||||
# FROM back AS base
|
|
||||||
|
|
||||||
ENV TZ Europe/Madrid
|
ENV TZ Europe/Madrid
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apk add --update nodejs npm python3 \
|
||||||
libkrb5-dev libssl-dev
|
krb5-dev libressl-dev
|
||||||
|
|
||||||
|
RUN apk update \
|
||||||
|
&& apk add --virtual build-dependencies \
|
||||||
|
build-base gcc wget git
|
||||||
|
|
||||||
|
|
||||||
RUN npm i -g pnpm
|
RUN npm i -g pnpm
|
||||||
|
|
||||||
WORKDIR /salix
|
WORKDIR /salix
|
||||||
|
|
||||||
COPY db db
|
COPY db db
|
||||||
# COPY node_modules node_modules
|
COPY node_modules node_modules
|
||||||
|
COPY .git .git
|
||||||
COPY myt.config.yml .
|
COPY myt.config.yml .
|
||||||
# RUN ls
|
|
||||||
|
|
||||||
RUN pnpm i @verdnatura/myt
|
# RUN pnpm i @verdnatura/myt
|
||||||
|
|
||||||
|
|
||||||
FROM base AS db
|
FROM base AS db
|
||||||
|
|
||||||
WORKDIR /salix
|
WORKDIR /salix
|
||||||
# RUN cat myt.config.yml
|
|
||||||
# RUN ls
|
|
||||||
# RUN cd db
|
|
||||||
# RUN ls
|
|
||||||
RUN usermod -aG docker $USER
|
|
||||||
# RUN npx myt run -d
|
|
||||||
CMD ["npx", "myt", "run", "-d"]
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
version: '3.7'
|
|
||||||
services:
|
services:
|
||||||
front:
|
front:
|
||||||
image: registry.verdnatura.es/salix-front:${VERSION:?}
|
image: registry.verdnatura.es/salix-front:${VERSION:?}
|
||||||
|
@ -9,14 +8,18 @@ services:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: back/Dockerfile
|
dockerfile: back/Dockerfile
|
||||||
# volumes:
|
depends_on:
|
||||||
# - ./storage:/salix/storage
|
- db
|
||||||
|
ports:
|
||||||
|
- 3000:3000
|
||||||
|
volumes:
|
||||||
|
- ./storage:/salix/storage
|
||||||
db:
|
db:
|
||||||
image: db
|
image: db
|
||||||
|
command: npx myt run -t -d --ci -n salix_default
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: db/Dockerfile
|
dockerfile: db/Dockerfile
|
||||||
target: db
|
target: db
|
||||||
# volumes:
|
volumes:
|
||||||
# - /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
# user: root
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"connector": "vn-mysql",
|
"connector": "vn-mysql",
|
||||||
"database": "vn",
|
"database": "vn",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "localhost",
|
"host": "vn-database",
|
||||||
"port": "3306",
|
"port": "3306",
|
||||||
"username": "root",
|
"username": "root",
|
||||||
"password": "root",
|
"password": "root",
|
||||||
|
|
Loading…
Reference in New Issue