diff --git a/.dockerignore b/.dockerignore index 72e8ffc..eb818f3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ * +!/dockerfiles/* \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index b8623ba..7776ca2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -57,8 +57,8 @@ services: exporter: container_name: monerod_exporter build: - context: dockerfiles - dockerfile: exporter + context: . + dockerfile: dockerfiles/exporter restart: unless-stopped # ports: # - 127.0.0.1:9000:9000 @@ -69,8 +69,8 @@ services: container_name: monerod_nodemapper restart: unless-stopped build: - context: dockerfiles - dockerfile: nodemapper + context: . + dockerfile: dockerfiles/nodemapper environment: NODE_HOST: monerod NODE_PORT: 18083 @@ -80,8 +80,8 @@ services: monerod: container_name: monerod build: - context: dockerfiles - dockerfile: monero + context: . + dockerfile: dockerfiles/monero restart: unless-stopped volumes: - ${DATA_DIR:-./data}:/data diff --git a/dockerfiles/nodemapper b/dockerfiles/nodemapper index 088b305..191e8c6 100644 --- a/dockerfiles/nodemapper +++ b/dockerfiles/nodemapper @@ -8,6 +8,6 @@ RUN .venv/bin/pip install flask==3.0.0 RUN .venv/bin/pip install geoip2==4.7.0 RUN wget https://github.com/P3TERX/GeoLite.mmdb/raw/download/GeoLite2-City.mmdb -qO ./geoip.mmdb -COPY nodemapper.py app.py +COPY dockerfiles/nodemapper.py app.py ENTRYPOINT [ ".venv/bin/flask", "--app", "app", "run", "--host", "0.0.0.0" ] \ No newline at end of file diff --git a/release.sh b/release.sh index 02a2abe..dcc150c 100644 --- a/release.sh +++ b/release.sh @@ -19,18 +19,18 @@ NODEMAPPER_BASE=${DH_USER}/nodemapper # build nodemapper docker build -t "${NODEMAPPER_BASE}:${NODEMAPPER_VERSION}" -f dockerfiles/nodemapper . docker tag "${NODEMAPPER_BASE}:${NODEMAPPER_VERSION}" "${NODEMAPPER_BASE}:latest" -docker push "${NODEMAPPER_BASE}:${NODEMAPPER_VERSION}" -docker push "${NODEMAPPER_BASE}:latest" +# docker push "${NODEMAPPER_BASE}:${NODEMAPPER_VERSION}" +# docker push "${NODEMAPPER_BASE}:latest" # build exporter docker build -t "${EXPORTER_BASE}:${EXPORTER_VERSION}" -f dockerfiles/exporter . docker tag "${EXPORTER_BASE}:${EXPORTER_VERSION}" "${EXPORTER_BASE}:latest" -docker push "${EXPORTER_BASE}:${EXPORTER_VERSION}" -docker push "${EXPORTER_BASE}:latest" +# docker push "${EXPORTER_BASE}:${EXPORTER_VERSION}" +# docker push "${EXPORTER_BASE}:latest" # build monerod docker build -t "${MONERO_BASE}:${MONERO_VERSION}" -f dockerfiles/nodemapper . docker tag "${MONERO_BASE}:${MONERO_VERSION}" "${MONERO_BASE}:latest" -docker push "${MONERO_BASE}:${MONERO_VERSION}" -docker push "${MONERO_BASE}:latest" +# docker push "${MONERO_BASE}:${MONERO_VERSION}" +# docker push "${MONERO_BASE}:latest"