Skip to content
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
4 changes: 2 additions & 2 deletions src/bebe/templates/compiler/clang.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ ENV CXX=/opt/clang-{{ params.compiler.version }}/bin/clang++
{% set version_parts = params.compiler.version.split('-') %}
{% if version_parts|length > 1 %}
{% set major_version = version_parts[1].split('.')[0] %}
RUN ln -s /opt/clang-{{ params.compiler.version }}/bin/clang /usr/bin/clang-{{ major_version }} && \
ln -s /opt/clang-{{ params.compiler.version }}/bin/clang++ /usr/bin/clang++-{{ major_version }} && \
RUN ln -sf /opt/clang-{{ params.compiler.version }}/bin/clang /usr/bin/clang-{{ major_version }} && \
ln -sf /opt/clang-{{ params.compiler.version }}/bin/clang++ /usr/bin/clang++-{{ major_version }} && \
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-{{ major_version }} 100 \
--slave /usr/bin/clang++ clang++ /usr/bin/clang++-{{ major_version }}
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions src/bebe/templates/compiler/gcc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ ENV CXX=/opt/gcc-{{ params.compiler.version }}/bin/g++
{% set version_parts = params.compiler.version.split('-') %}
{% if version_parts|length > 1 %}
{% set major_version = version_parts[1].split('.')[0] %}
RUN ln -s /opt/gcc-{{ params.compiler.version }}/bin/gcc /usr/bin/gcc-{{ major_version }} && \
ln -s /opt/gcc-{{ params.compiler.version }}/bin/g++ /usr/bin/g++-{{ major_version }} && \
RUN ln -sf /opt/gcc-{{ params.compiler.version }}/bin/gcc /usr/bin/gcc-{{ major_version }} && \
ln -sf /opt/gcc-{{ params.compiler.version }}/bin/g++ /usr/bin/g++-{{ major_version }} && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-{{ major_version }} 100 \
--slave /usr/bin/g++ g++ /usr/bin/g++-{{ major_version }}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/bebe/templates/os/ubuntu/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Install only minimal runtime dependencies
# hadolint ignore=DL3008
RUN apt-get update && apt-get install -y --no-install-recommends \
wget curl git ca-certificates gnupg \
wget curl git ca-certificates gnupg build-essential libc6-dev \
&& rm -rf /var/lib/apt/lists/*

# Initialize current_stage state for chained builds
Expand Down
Loading