diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 5f90b7c..0000000 --- a/.dockerignore +++ /dev/null @@ -1,7 +0,0 @@ -node_modules -npm-debug.log -.dockerignore -.git -.gitignore -Dockerfile -README.md diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ddbeeb7..0000000 --- a/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -FROM node:20-bullseye - -# install system dependencies -RUN apt-get update && apt-get install -y \ - git \ - openssh-client \ - rsync \ - curl \ - php-cli \ - php-mbstring \ - jq \ - && rm -rf /var/lib/apt/lists/* - -# set working directory -WORKDIR /workdir - -# build time args -ARG GIT_REPO -ARG GIT_BRANCH=main - -# clone source -RUN git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPO} app - -# move into app directory -WORKDIR /workdir/app - -# build-time env vars -ARG POSTGREST_API_KEY -ARG POSTGREST_URL - -# export vars for build staps -ENV POSTGREST_API_KEY=${POSTGREST_API_KEY} -ENV POSTGREST_URL=${POSTGREST_URL} - -# clean npm cache -RUN npm cache clean --force - -# install deps -RUN npm install - -# build -RUN npm run build - -# set runtime env vars -ARG SERVER_IP -ENV SERVER_IP=${SERVER_IP} - -# deploy and manage container healthcheck -CMD bash -c "\ - mkdir -p ~/.ssh && \ - echo \"${SSH_PRIVATE_KEY}\" > ~/.ssh/id_rsa && \ - chmod 600 ~/.ssh/id_rsa && \ - ssh-keyscan -H \"${SERVER_IP}\" >> ~/.ssh/known_hosts && \ - rsync -avz --delete dist/ root@\"${SERVER_IP}\":/var/www/coryd.dev/ && \ - echo \"✅ Deployed successfully\" && \ - tail -f /dev/null" diff --git a/nixpacks.toml b/nixpacks.toml new file mode 100644 index 0000000..4580bb6 --- /dev/null +++ b/nixpacks.toml @@ -0,0 +1,15 @@ +[phases.setup] +aptPkgs = [ + "curl", + "wget", + "zip", + "unzip", + "php-cli", + "php-mbstring", + "openssh-client", + "rsync", + "jq" +] +cmds = [ + "curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && chmod +x /usr/bin/composer", +] diff --git a/package-lock.json b/package-lock.json index 10078f8..fc8e13f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "3.4.0", + "version": "3.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "3.4.0", + "version": "3.3.4", "license": "MIT", "dependencies": { "html-minifier-terser": "7.2.0", diff --git a/package.json b/package.json index 9671892..a924eb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "3.4.0", + "version": "3.3.4", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "engines": {