diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index cd74655ee..000000000 --- a/.dockerignore +++ /dev/null @@ -1,32 +0,0 @@ -debug.log -CORS.json -*.bat -dev/* - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build -/dist -/.idea -/.git - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* - -cardconjurer.iml -access.log -error.log diff --git a/.env b/.env deleted file mode 100644 index 4218dc88b..000000000 --- a/.env +++ /dev/null @@ -1 +0,0 @@ -config.hosts << "img.scryfall.com" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9a552394c..7b8df3f39 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ access.log error.log fly.toml +docker-compose.override.yml diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0216fe5a4..000000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -# syntax = docker/dockerfile:1.2 -FROM nginx:1.21-alpine as prod - -EXPOSE 4242 -COPY . /usr/share/nginx/html/ -COPY app.conf /etc/nginx/nginx.conf - diff --git a/Makefile b/Makefile deleted file mode 100644 index 5475649ed..000000000 --- a/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -start: - docker build -f Dockerfile --target "prod" . -t "cardconjurer-client" && docker run -dit -h 127.0.0.1 -p 4242:4242 "cardconjurer-client" diff --git a/data/scripts/main.js b/data/scripts/main.js index 3649f2720..8bee490c7 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -824,7 +824,7 @@ function inputCardArtNameNumber(cardArtNameNumberInput) { temporaryCardArt.onload = function() { cardArt.src = this.src } - temporaryCardArt.src = cardArtUrlList[cardArtNameNumberInput - 1] //config.hosts << "img.scryfall.com" //environment configuration + temporaryCardArt.src = cardArtUrlList[cardArtNameNumberInput - 1] document.getElementById('inputInfoArtist').value = cardArtArtistList[cardArtNameNumberInput - 1] document.getElementById('inputInfoArtist2').value = document.getElementById('inputInfoArtist').value bottomInfoUpdated() diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..7b33bcd4c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +services: + cardconjurer: + image: nginx:stable-alpine + ports: + - "4242:4242" + volumes: + - ./:/usr/share/nginx/html/:ro + - ./docker/app.conf:/etc/nginx/nginx.conf:ro diff --git a/app.conf b/docker/app.conf similarity index 100% rename from app.conf rename to docker/app.conf