Skip to content

Commit 07179c1

Browse files
committed
Update hydrodump-action
1 parent 6276c1d commit 07179c1

File tree

6 files changed

+23
-22
lines changed

6 files changed

+23
-22
lines changed

.env.example

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Postgres Database
2+
POSTGRES_HOST=database
3+
POSTGRES_PORT=5432
4+
POSTGRES_DB=reference
5+
POSTGRES_USER=root
6+
POSTGRES_PASSWORD=password
7+
8+
# Hydroshare credentials
9+
HYDRO_USERNAME=user
10+
HYDRO_PASSWORD=password
11+
HYDRO_RESOURCE=3295a17b4cc24d34bd6a5c5aaf753c50

.github/workflows/flake8.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ jobs:
88

99
steps:
1010
- name: Setup Python
11-
uses: actions/setup-python@v1
11+
uses: actions/setup-python@v3
1212
with:
13-
python-version: 3.8
14-
architecture: x64
13+
python-version: "3.10"
1514
- name: Checkout repository
1615
uses: actions/checkout@master
1716
- name: Install flake8

.github/workflows/ghcr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ jobs:
2727

2828
steps:
2929
- name: Checkout branch
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
3131

3232
- name: Set up QEMU
33-
uses: docker/setup-qemu-action@v1
33+
uses: docker/setup-qemu-action@v3
3434

3535
- name: Login to GitHub Container Registry
36-
uses: docker/login-action@v1
36+
uses: docker/login-action@v3
3737
with:
3838
registry: ${{ env.REGISTRY }}
3939
username: ${{ github.repository_owner }}
4040
password: ${{ secrets.GITHUB_TOKEN }}
4141

4242
- name: Set up Docker Buildx
4343
id: buildx
44-
uses: docker/setup-buildx-action@v1
44+
uses: docker/setup-buildx-action@v3
4545

4646
- name: Docker meta
4747
id: meta
@@ -54,7 +54,7 @@ jobs:
5454
type=semver,pattern={{version}}
5555
5656
- name: Build and push
57-
uses: docker/build-push-action@v2.7.0
57+
uses: docker/build-push-action@v4
5858
with:
5959
context: ./hydrodump
6060
file: ./hydrodump/Dockerfile

action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@ runs:
8080
- shell: bash
8181
run: docker exec hydrodump hydrodump run
8282
- shell: bash
83-
run: docker exec database pg_dump --clean --if-exists | gzip > ${{ inputs.db }}.sql.gz
83+
run: |
84+
docker exec database pg_dump --clean --if-exists | gzip > ${{ inputs.db }}.sql.gz

docker-compose.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Authors: Benjamin Webb <bwebb@lincolninst.edu>
44
#
5-
# Copyright (c) 2022 Benjamin Webb
5+
# Copyright (c) 2025 Benjamin Webb
66
#
77
# Permission is hereby granted, free of charge, to any person
88
# obtaining a copy of this software and associated documentation
@@ -26,9 +26,6 @@
2626
# OTHER DEALINGS IN THE SOFTWARE.
2727
#
2828
# =================================================================
29-
30-
version: '3'
31-
3229
services:
3330
hydrodump:
3431
container_name: hydrodump
@@ -50,21 +47,14 @@ services:
5047
- database
5148

5249
database:
53-
container_name: database
50+
container_name: $POSTGRES_HOST
5451
image: postgis/postgis:14-3.2-alpine
5552
volumes:
5653
- ./data:/data
5754
environment:
58-
- POSTGRES_HOST=$POSTGRES_HOST
5955
- POSTGRES_PORT=$POSTGRES_PORT
6056
- POSTGRES_DB=$POSTGRES_DB
61-
- PGDATABASE=$POSTGRES_DB
6257
- POSTGRES_USER=$POSTGRES_USER
63-
- PGUSER=$POSTGRES_USER
6458
- POSTGRES_PASSWORD=$POSTGRES_PASSWORD
65-
- PGPASSWORD=$POSTGRES_PASSWORD
66-
- HYDRO_USERNAME=$HYDRO_USERNAME
67-
- HYDRO_PASSWORD=$HYDRO_PASSWORD
68-
- HYDRO_RESOURCE=$HYDRO_RESOURCE
6959
ports:
7060
- 5432:5432

hydrodump/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
click
22
hsclient
3-
pydantic<2
3+
pydantic
44
# GDAL>=3.0.0

0 commit comments

Comments
 (0)