Skip to content

Commit

Permalink
Publish stable (#3)
Browse files Browse the repository at this point in the history
* create unstable release tag, upgrade to latest node, gdal and python3

* fix misuse of x86 miniconda for arm

* test build of last

* switch back to arm64
  • Loading branch information
twelch authored Jun 26, 2024
1 parent 69bb889 commit fd4ac7d
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 16 deletions.
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

0 comments on commit fd4ac7d

Please sign in to comment.