diff --git a/README.md b/README.md index 425fed4..1555bdc 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,8 @@ Deploy instructions: -- Uncomment the `pull_policy` line from `docker-compose.yml` -- Update `docker-compose.yml` with new version numbers. -- Run `docker login git.edwardpeterson.dev` -- Run `docker-compose build --pull` from the root directory -- Run `docker-compose push` next to push the newest image to gitea. -- Comment back out the `pull_policy` line from `docker-compose.yml` -- Commit and push changes. +- Run `./build.sh` script and pass new version number as parameter. +- Commit and push changes +- Upgrade BUILD_VERSION env var in Portainer +- Redeploy \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..dd6e539 --- /dev/null +++ b/build.sh @@ -0,0 +1,6 @@ + +export BUILD_VERSION=$1 +docker login git.edwardpeterson.dev +docker-compose -f docker-compose-build.yml build --pull +docker-compose -f docker-compose-build.yml push +echo "Upload complete. Make sure to update the BUILD_VERSION env var in Portainer to $1" \ No newline at end of file diff --git a/docker-compose-build.yml b/docker-compose-build.yml new file mode 100644 index 0000000..c0615c4 --- /dev/null +++ b/docker-compose-build.yml @@ -0,0 +1,16 @@ +version: '3.7' + +services: + + amxregistry-bundler: + image: git.edwardpeterson.dev/cubemaster21/amxregistry-bundler:${BUILD_VERSION} + pull_policy: build + restart: always + build: + no_cache: true + context: . + dockerfile: ./Dockerfile + ports: + - 2667:2667 + env_file: + - stack.env \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f505a0d..9cbd40d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,7 @@ version: '3.7' services: amxregistry-bundler: - image: git.edwardpeterson.dev/cubemaster21/amxregistry-bundler:v1.0 - # container_name: amxregistry-client + image: git.edwardpeterson.dev/cubemaster21/amxregistry-bundler:${BUILD_VERSION} # pull_policy: build restart: always build: @@ -12,4 +11,6 @@ services: context: . dockerfile: ./Dockerfile ports: - - 2667:2667 \ No newline at end of file + - 2667:2667 + env_file: + - stack.env \ No newline at end of file diff --git a/server/crawlers/topclassiccarsforsale.crawler.js b/server/crawlers/topclassiccarsforsale.crawler.js index f59f46e..3fd821e 100644 --- a/server/crawlers/topclassiccarsforsale.crawler.js +++ b/server/crawlers/topclassiccarsforsale.crawler.js @@ -42,6 +42,7 @@ module.exports = { }); }) } + await browser.close(); }, processPage: async function(page) {