From 07179c183cf9a343d4875734f39ea4b4ef49dec1 Mon Sep 17 00:00:00 2001 From: Benjamin Webb Date: Tue, 11 Mar 2025 18:44:59 -0400 Subject: [PATCH] Update hydrodump-action --- .env.example | 11 +++++++++++ .github/workflows/flake8.yml | 5 ++--- .github/workflows/ghcr.yml | 10 +++++----- action.yml | 3 ++- docker-compose.yml | 14 ++------------ hydrodump/requirements.txt | 2 +- 6 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..1197f1d --- /dev/null +++ b/.env.example @@ -0,0 +1,11 @@ +# Postgres Database +POSTGRES_HOST=database +POSTGRES_PORT=5432 +POSTGRES_DB=reference +POSTGRES_USER=root +POSTGRES_PASSWORD=password + +# Hydroshare credentials +HYDRO_USERNAME=user +HYDRO_PASSWORD=password +HYDRO_RESOURCE=3295a17b4cc24d34bd6a5c5aaf753c50 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index c7f3d3d..01a2620 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -8,10 +8,9 @@ jobs: steps: - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v3 with: - python-version: 3.8 - architecture: x64 + python-version: "3.10" - name: Checkout repository uses: actions/checkout@master - name: Install flake8 diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index 9efbf5a..9613028 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -27,13 +27,13 @@ jobs: steps: - name: Checkout branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.repository_owner }} @@ -41,7 +41,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Docker meta id: meta @@ -54,7 +54,7 @@ jobs: type=semver,pattern={{version}} - name: Build and push - uses: docker/build-push-action@v2.7.0 + uses: docker/build-push-action@v4 with: context: ./hydrodump file: ./hydrodump/Dockerfile diff --git a/action.yml b/action.yml index c297956..c408072 100644 --- a/action.yml +++ b/action.yml @@ -80,4 +80,5 @@ runs: - shell: bash run: docker exec hydrodump hydrodump run - shell: bash - run: docker exec database pg_dump --clean --if-exists | gzip > ${{ inputs.db }}.sql.gz + run: | + docker exec database pg_dump --clean --if-exists | gzip > ${{ inputs.db }}.sql.gz diff --git a/docker-compose.yml b/docker-compose.yml index 9ae59b9..2107940 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ # # Authors: Benjamin Webb # -# Copyright (c) 2022 Benjamin Webb +# Copyright (c) 2025 Benjamin Webb # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -26,9 +26,6 @@ # OTHER DEALINGS IN THE SOFTWARE. # # ================================================================= - -version: '3' - services: hydrodump: container_name: hydrodump @@ -50,21 +47,14 @@ services: - database database: - container_name: database + container_name: $POSTGRES_HOST image: postgis/postgis:14-3.2-alpine volumes: - ./data:/data environment: - - POSTGRES_HOST=$POSTGRES_HOST - POSTGRES_PORT=$POSTGRES_PORT - POSTGRES_DB=$POSTGRES_DB - - PGDATABASE=$POSTGRES_DB - POSTGRES_USER=$POSTGRES_USER - - PGUSER=$POSTGRES_USER - POSTGRES_PASSWORD=$POSTGRES_PASSWORD - - PGPASSWORD=$POSTGRES_PASSWORD - - HYDRO_USERNAME=$HYDRO_USERNAME - - HYDRO_PASSWORD=$HYDRO_PASSWORD - - HYDRO_RESOURCE=$HYDRO_RESOURCE ports: - 5432:5432 diff --git a/hydrodump/requirements.txt b/hydrodump/requirements.txt index 2672ed3..83d3aea 100644 --- a/hydrodump/requirements.txt +++ b/hydrodump/requirements.txt @@ -1,4 +1,4 @@ click hsclient -pydantic<2 +pydantic # GDAL>=3.0.0