Skip to content

Dev #18

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.

Sign up for GitHub

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

Merged
rmcolq merged 3 commits into from
Apr 30, 2025
Merged

Dev #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
837aedd
enable correct versioning in docker image
rmcolq Apr 30, 2025
e8cbe6a
Update docker_push.yml
rmcolq Apr 30, 2025
862d2a7
add build argument to dockerfile if dev branch so can clone directly …
rmcolq Apr 30, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/docker_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ jobs:
uses: actions/checkout@v2

- name: Build new docker image
if: ${{ github.event_name == 'push' }}
run: docker build --no-cache . -t rmcolq/charon:latest --build-arg is_dev="True"
- name: Build new docker image
if: ${{ github.event_name == 'release' }}
run: docker build --no-cache . -t rmcolq/charon:latest

- name: Push Docker image to DockerHub (dev)
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ubuntu:24.04

ARG is_dev

RUN apt update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
gcc-14 g++-14 \
Expand All @@ -11,12 +13,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
RUN update-alternatives --install /usr/bin/g++ g++ /bin/g++-14 14
RUN update-alternatives --install /usr/bin/gcc gcc /bin/gcc-14 14

RUN mkdir -p /charon
COPY src /charon/src
COPY include /charon/include
COPY cmake /charon/cmake
COPY lib /charon/lib
COPY CMakeLists.txt version.h.in /charon
WORKDIR /
RUN if [[ -z "$is_dev" ]] ; then git clone -b dev https://github.com/rmcolq/charon.git; else git clone https://github.com/rmcolq/charon.git; fi
WORKDIR /charon/build

RUN cmake -DCMAKE_BUILD_TYPE=RELEASE .. > cmake.log
Expand Down