diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile index 670f2db2..11c20ab2 100644 --- a/docs/docker/Dockerfile +++ b/docs/docker/Dockerfile @@ -1,8 +1,18 @@ -FROM node:17-slim -RUN bash -c "apt update -y && apt install git -y && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp" -RUN yarn global remove gancio || true -RUN yarn cache clean -RUN yarn global add --latest --production --silent https://gancio.org/latest.tgz -ADD entrypoint.sh / -RUN chmod 755 /entrypoint.sh -ENTRYPOINT [ "/bin/sh", "/entrypoint.sh" ] +FROM debian:stable-slim AS nodejs-base +RUN apt-get -q update && \ + env DEBIAN_FRONTEND=noninteractive apt-get -y install nodejs && \ + apt-get clean && rm -fr /var/lib/apt/lists/* + +FROM nodejs-base AS build +RUN apt-get -q update && \ + env DEBIAN_FRONTEND=noninteractive apt-get -y install git yarnpkg && \ + yarnpkg global add --latest --production --silent http://192.168.10.159:8080/l.tgz && \ + apt-get clean && rm -fr /var/lib/apt/lists/* + +FROM nodejs-base +COPY --from=build /usr/local/share/.config/yarn/ /usr/local/share/.config/yarn/ +RUN ln -s ../share/.config/yarn/global/node_modules/.bin/gancio /usr/local/bin/gancio + +ENTRYPOINT ["/usr/local/bin/gancio"] + + diff --git a/docs/docker/docker-compose.yml b/docs/docker/docker-compose.yml index fdb433bb..54e4f97e 100644 --- a/docs/docker/docker-compose.yml +++ b/docs/docker/docker-compose.yml @@ -2,9 +2,8 @@ version: '3' services: gancio: - build: . restart: always - image: gancio + image: cisti/gancio container_name: gancio environment: - PATH=$PATH:/home/node/.yarn/bin @@ -12,8 +11,6 @@ services: - NODE_ENV=production - GANCIO_DB_DIALECT=sqlite - GANCIO_DB_STORAGE=./gancio.sqlite - entrypoint: /entrypoint.sh - command: gancio start volumes: - ./data:/home/node/data ports: diff --git a/docs/docker/entrypoint.sh b/docs/docker/entrypoint.sh deleted file mode 100755 index 7f124b75..00000000 --- a/docs/docker/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -chown -R node:node /home/node -su node -c "$*" - diff --git a/docs/docker/mariadb/docker-compose.yml b/docs/docker/mariadb/docker-compose.yml index 3dab105e..d47a90ce 100644 --- a/docs/docker/mariadb/docker-compose.yml +++ b/docs/docker/mariadb/docker-compose.yml @@ -14,9 +14,8 @@ services: - MARIADB_RANDOM_ROOT_PASSWORD=yes restart: always gancio: - build: . restart: always - image: gancio + image: cisti/gancio container_name: gancio environment: - PATH=$PATH:/home/node/.yarn/bin @@ -28,8 +27,6 @@ services: - GANCIO_DB_DATABASE=gancio - GANCIO_DB_USERNAME=gancio - GANCIO_DB_PASSWORD=gancio - command: gancio start - entrypoint: /entrypoint.sh volumes: - ./data:/home/node/data ports: diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml index ad0a61f7..9234ba2d 100644 --- a/docs/docker/postgres/docker-compose.yml +++ b/docs/docker/postgres/docker-compose.yml @@ -16,9 +16,8 @@ services: ports: - 5432:5432 gancio: - build: . restart: always - image: gancio + image: cisti/gancio container_name: gancio environment: - PATH=$PATH:/home/node/.yarn/bin @@ -30,8 +29,6 @@ services: - GANCIO_DB_DATABASE=gancio - GANCIO_DB_USERNAME=gancio - GANCIO_DB_PASSWORD=gancio - command: gancio start - entrypoint: /entrypoint.sh volumes: - ./data:/home/node/data ports: diff --git a/docs/docker/sqlite/docker-compose.yml b/docs/docker/sqlite/docker-compose.yml index fdb433bb..54e4f97e 100644 --- a/docs/docker/sqlite/docker-compose.yml +++ b/docs/docker/sqlite/docker-compose.yml @@ -2,9 +2,8 @@ version: '3' services: gancio: - build: . restart: always - image: gancio + image: cisti/gancio container_name: gancio environment: - PATH=$PATH:/home/node/.yarn/bin @@ -12,8 +11,6 @@ services: - NODE_ENV=production - GANCIO_DB_DIALECT=sqlite - GANCIO_DB_STORAGE=./gancio.sqlite - entrypoint: /entrypoint.sh - command: gancio start volumes: - ./data:/home/node/data ports: