Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish stable #3

Merged
merged 4 commits into from
Jun 26, 2024
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
51 changes: 51 additions & 0 deletions .github/workflows/publish-unstable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: publish-unstable

on:
push:
branches:
- "dev"

jobs:
docker:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
# list of Docker images to use as base name for tags
images: |
seasketch/geoprocessing-workspace
# generate Docker tags based on the following events/attributes
tags: |
type=sha
-
name: Build and push
uses: docker/build-push-action@v3
with:
file: Dockerfile
context: .
cache-from: type=gha
cache-to: type=gha,mode=max
platforms: linux/amd64,linux/arm64
push: true
tags: |
seasketch/geoprocessing-workspace:unstable
${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ RUN sudo apt-get update && sudo apt-get -y upgrade \
&& sudo rm -rf /var/lib/apt/lists/*

# Install nvm to user directory - based on https://github.com/nvm-sh/nvm and https://github.com/nvm-sh/nvm/blob/master/Dockerfile
ENV NODE_VERSION v16.16.0
ENV NODE_VERSION v20.12.1
RUN mkdir -p /home/vscode/.nvm/
RUN chown vscode:vscode -R "$HOME/.nvm"
RUN echo 'export NVM_DIR="/home/vscode/.nvm"' >> "$HOME/.bashrc"
RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> "$HOME/.bashrc"
RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "$HOME/.bashrc"
RUN cd ~
RUN sudo curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
RUN sudo curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash

# Install platform specific dependencies
COPY installer/ /installer
Expand Down
10 changes: 5 additions & 5 deletions installer/linux/amd64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# Put installer in current user home directory, install to home directory, add to user bash config, and remove installer
mkdir -p ~/miniconda \
&& cd ~/miniconda \
&& wget https://repo.anaconda.com/miniconda/Miniconda3-py38_23.3.1-0-Linux-x86_64.sh \
&& wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \
&& mkdir ~/.conda \
&& chmod 755 Miniconda3-py38_23.3.1-0-Linux-x86_64.sh \
&& bash Miniconda3-py38_23.3.1-0-Linux-x86_64.sh -b -p /home/vscode/miniconda3 \
&& chmod 755 Miniconda3-latest-Linux-x86_64.sh \
&& bash Miniconda3-latest-Linux-x86_64.sh -b -p /home/vscode/miniconda3 \
&& echo "Running $(conda --version)" && \
conda init bash && \
. /home/vscode/.bashrc && \
conda update conda && \
conda install python=3.8 pip && \
conda install -c conda-forge gdal=3.3.1 && \
conda install python pip && \
conda install -c conda-forge gdal && \
cd ~ && \
rm -rf ~/miniconda

Expand Down
10 changes: 5 additions & 5 deletions installer/linux/arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# Put installer in current user home directory, install to home directory, add to user bash config, and remove installer
mkdir -p ~/miniconda \
&& cd ~/miniconda \
&& wget https://repo.anaconda.com/miniconda/Miniconda3-py38_23.3.1-0-Linux-aarch64.sh \
&& wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-aarch64.sh \
&& mkdir ~/.conda \
&& chmod 755 Miniconda3-py38_23.3.1-0-Linux-aarch64.sh \
&& bash Miniconda3-py38_23.3.1-0-Linux-aarch64.sh -b -p /home/vscode/miniconda3 \
&& chmod 755 Miniconda3-latest-Linux-aarch64.sh \
&& bash Miniconda3-latest-Linux-aarch64.sh -b -p /home/vscode/miniconda3 \
&& echo "Running $(conda --version)" && \
conda init bash && \
. /home/vscode/.bashrc && \
conda update conda && \
conda install python=3.8 pip && \
conda install -c conda-forge gdal=3.3.1 && \
conda install pip && \
conda install -c conda-forge gdal && \
cd ~ && \
rm -rf ~/miniconda

Expand Down
8 changes: 4 additions & 4 deletions tests/run_tests.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

echo
echo "proj" $(proj 2>&1 | head -n 1)
echo "geos" $(geos-config --version)
# echo "proj" $(proj 2>&1 | head -n 1)
# echo "geos" $(geos-config --version)
gdalinfo --version
ogrinfo --formats | grep FlatGeobuf
python --version
echo "node" $(node -v)
echo "npm" $(npm -v)
# echo "node" $(node -v)
# echo "npm" $(npm -v)

exit 0
Loading