Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ 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 }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Docker meta
id: meta
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 2 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Authors: Benjamin Webb <bwebb@lincolninst.edu>
#
# 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
Expand All @@ -26,9 +26,6 @@
# OTHER DEALINGS IN THE SOFTWARE.
#
# =================================================================

version: '3'

services:
hydrodump:
container_name: hydrodump
Expand All @@ -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
2 changes: 1 addition & 1 deletion hydrodump/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
click
hsclient
pydantic<2
pydantic
# GDAL>=3.0.0