From f05b2fb183432529d2d1e99c20cba977244d9b18 Mon Sep 17 00:00:00 2001 From: Andreas <38031952+AnHeuermann@users.noreply.github.com> Date: Mon, 6 Nov 2023 16:25:23 +0100 Subject: [PATCH] Adding bison to build-deps:v1.22 (#6) * Merging main branch * Adding bison * Bumping build-deps version --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 4 ++-- Dockerfile | 1 + README.md | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d472642..2cadb9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: timeout-minutes: 60 steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Extract metadata (tags, labels) for Docker id: meta diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fc9d9e5..4a40561 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,10 +11,10 @@ jobs: timeout-minutes: 60 steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Log in to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 9315a08..4512abf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN apt-get update && apt-get build-dep -qy openmodelica RUN apt-get install -qy \ aspell \ bibtex2html \ + bison \ ccache \ clang-tools \ devscripts \ diff --git a/README.md b/README.md index c330223..0c2b99d 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,14 @@ publish the Docker image to [https://hub.docker.com/repository/docker/anheuerman ## Build ```bash -export TAG=v1.22.1 +export TAG=v1.22.2 docker build --pull --no-cache --tag build-deps:$TAG . ``` or ```bash -export TAG=v1.22.1 +export TAG=v1.22.2 docker build --pull --no-cache --squash --tag build-deps:$TAG . ``` @@ -59,7 +59,7 @@ To upload to docker.openmodelica.org (you'll need write access) run: ```bash export REGISTRY=docker.openmodelica.org -export TAG=v1.22.1 +export TAG=v1.22.2 docker login docker image tag build-deps:$TAG $REGISTRY/build-deps:$TAG docker push $REGISTRY/build-deps:$TAG