diff --git a/.github/workflows/quarto.yml b/.github/workflows/quarto.yml deleted file mode 100644 index 22384eb..0000000 --- a/.github/workflows/quarto.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: quarto - -on: - schedule: - - cron: '0 05 * * 6' # everyday Sunday at 1am - push: - branches: - - 'master' - - 'main' - paths: - - 'quarto/**' - -jobs: - docker: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - # list of Docker images to use as base name for tags - images: | - geocompr/geocompr - ghcr.io/geocompx/quarto - # generate Docker tags based on the following events/attributes - tags: | - type=sha, - type=raw,value={{date 'YYYY-MM-DD'}},prefix=date_ - type=raw,value=latest - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: quarto - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/dockerfiles/conda/Dockerfile b/dockerfiles/conda/Dockerfile index b619d65..bd75ea1 100644 --- a/dockerfiles/conda/Dockerfile +++ b/dockerfiles/conda/Dockerfile @@ -16,7 +16,7 @@ RUN . /root/.bashrc && \ RUN echo "conda activate geocompy" >> ~/.bashrc SHELL ["/bin/bash", "--login", "-c"] -RUN wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.54/quarto-1.5.54-linux-amd64.deb +RUN wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.57/quarto-1.5.57-linux-amd64.deb RUN dpkg -i quarto* # RUN wget https://github.com/geocompr/py/archive/refs/heads/main.zip diff --git a/python/Dockerfile b/python/Dockerfile index 70b5d39..269843e 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -6,7 +6,7 @@ RUN apt update && apt install -y \ git \ && rm -rf /var/lib/apt/lists/* # Install quarto -RUN wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.54/quarto-1.5.54-linux-amd64.deb +RUN wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.57/quarto-1.5.57-linux-amd64.deb RUN dpkg -i quarto* RUN rm quarto* # Install requirements diff --git a/quarto/Dockerfile b/quarto/Dockerfile deleted file mode 100644 index 8bde0dd..0000000 --- a/quarto/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM ubuntu:jammy - -RUN apt update -RUN apt install wget -y -RUN wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.54/quarto-1.5.54-linux-amd64.deb -RUN dpkg -i quarto*