From 18b53db73706640edf4ecfd3b831c83e194cb0a5 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Tue, 13 Feb 2024 18:58:37 +0000 Subject: [PATCH] Update deploy a bit --- .dockerignorefile | 1 + compose.yml | 11 +++++++++++ Dockerfile => packages/website/Dockerfile | 2 +- servers/main.bu | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .dockerignorefile create mode 100644 compose.yml rename Dockerfile => packages/website/Dockerfile (97%) diff --git a/.dockerignorefile b/.dockerignorefile new file mode 100644 index 00000000..3e8021f8 --- /dev/null +++ b/.dockerignorefile @@ -0,0 +1 @@ +servers \ No newline at end of file diff --git a/compose.yml b/compose.yml new file mode 100644 index 00000000..91166e41 --- /dev/null +++ b/compose.yml @@ -0,0 +1,11 @@ + +version: '2' +services: + + jade-website-frontend: + image: jade-website-frontend:latest + build: + context: . + dockerfile: packages/website/Dockerfile + ports: + - 3000:3000 diff --git a/Dockerfile b/packages/website/Dockerfile similarity index 97% rename from Dockerfile rename to packages/website/Dockerfile index ee463444..1c163d05 100644 --- a/Dockerfile +++ b/packages/website/Dockerfile @@ -3,7 +3,7 @@ FROM node AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable -COPY . /app +COPY ./../.. /app/ WORKDIR /app # FROM base AS prod-deps diff --git a/servers/main.bu b/servers/main.bu index ea1d5e0e..b50efe57 100644 --- a/servers/main.bu +++ b/servers/main.bu @@ -29,7 +29,7 @@ systemd: # if the package is already installed. This is useful if the package is # added to the root image in a future Fedora CoreOS release as it will # prevent the service from failing. - ExecStart=/usr/bin/rpm-ostree install --apply-live --allow-inactive cockpit-system cockpit-ostree cockpit-podman cockpit-storaged cockpit-networkmanager cockpit-ostree cockpit-selinux cockpit-kdump cockpit-certificates cockpit-sosreport cockpit-tailscale + ExecStart=/usr/bin/rpm-ostree install --apply-live --allow-inactive cockpit-system cockpit-ostree cockpit-podman cockpit-storaged cockpit-networkmanager cockpit-ostree cockpit-selinux cockpit-kdump cockpit-certificates cockpit-sosreport cockpit-tailscale cockpit-pcp ExecStart=/bin/touch /var/lib/%N.stamp [Install]