Skip to content

Commit cc2f53e

Browse files
committed
Updated NodeJS to 20, base image to Ubuntu 24.04, added latest g++, removed older clang
1 parent a40f7af commit cc2f53e

File tree

7 files changed

+26
-55
lines changed

7 files changed

+26
-55
lines changed

.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*
2+
!Dockerfile
3+
!cpp.properties

.github/workflows/build.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ jobs:
1717
# steps to perform in job
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121

2222
# setup Docker buld action
2323
- name: Set up Docker Buildx
2424
id: buildx
25-
uses: docker/setup-buildx-action@v1
25+
uses: docker/setup-buildx-action@v3
2626

2727
- name: Login to DockerHub
28-
uses: docker/login-action@v2
28+
uses: docker/login-action@v3
2929
with:
3030
username: ${{ secrets.DOCKERHUB_USERNAME }}
3131
password: ${{ secrets.DOCKERHUB_TOKEN }}
3232

3333
- name: Build image and push to Docker Hub
34-
uses: docker/build-push-action@v2
34+
uses: docker/build-push-action@v6
3535
with:
3636
# relative path to the place where source code with Dockerfile is located
3737
context: ./

.travis.yml

-12
This file was deleted.

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM madduci/docker-linux-cpp:latest
22

33
LABEL maintainer="Michele Adduci <adduci@tutanota.com>" \
4-
license="Copyright (c) 2012-2022, Matt Godbolt"
4+
license="Copyright (c) 2012-2024, Matt Godbolt"
55

66
EXPOSE 10240
77

@@ -12,7 +12,7 @@ RUN echo "*** Installing Compiler Explorer ***" \
1212
&& add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" \
1313
&& DEBIAN_FRONTEND=noninteractive apt-get update \
1414
&& apt-get install -y curl \
15-
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \
15+
&& curl -sL https://deb.nodesource.com/setup_20.x | bash - \
1616
&& apt-get install -y \
1717
wget \
1818
ca-certificates \

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2021, Matt Godbolt
1+
Copyright (c) 2012-2024, Matt Godbolt
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
[![Build and Publish](https://github.com/madduci/docker-compiler-explorer/actions/workflows/build.yaml/badge.svg)](https://github.com/madduci/docker-compiler-explorer/actions/workflows/build.yaml)
44

5-
A docker-based version of [Matt Godbolt's Compiler Explorer](https://github.com/mattgodbolt/compiler-explorer) for self-hosting purposes.
5+
A docker-based version of [Matt Godbolt's Compiler Explorer](https://github.com/compiler-explorer/compiler-explorer) for self-hosting purposes.
66

77
The repository contains a `Dockerfile` with all the required instructions to build the compiler explorer application (with some adjustments to the Makefile as long as there's no 'sudo') and a `docker-compose.yml` file, which keeps some setup instructions such as the port mapping and network, in case you might want to map the default port exposed by the application, 10240, in an easy way.
88

99
## Requirements
1010

11-
* Docker (possibly the latest version, 17.06+)
12-
* docker-compose (1.16+)
11+
* Docker (possibly the latest version, 24.0+)
12+
* docker-compose (2.0+)
1313

1414
## Build/Run instructions
1515

cpp.properties

+13-33
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,34 @@
11
# Default settings for C++
22
compilers=&gcc:&clang
33

4-
group.gcc.compilers=g9:g10:g11:gdefault
5-
compiler.g9.exe=/usr/bin/g++-9
6-
compiler.g9.name=g++ 9
7-
compiler.g10.exe=/usr/bin/g++-10
8-
compiler.g10.name=g++ 10
9-
compiler.g11.exe=/usr/bin/g++-11
10-
compiler.g11.name=g++ 11
11-
compiler.gdefault.exe=/usr/bin/g++-11
12-
compiler.gdefault.name=g++ default (11)
4+
group.gcc.compilers=g12:g13:g14:gdefault
5+
compiler.g12.exe=/usr/bin/g++-12
6+
compiler.g12.name=g++ 12
7+
compiler.g13.exe=/usr/bin/g++-13
8+
compiler.g13.name=g++ 13
9+
compiler.g14.exe=/usr/bin/g++-14
10+
compiler.g14.name=g++ 14
11+
compiler.gdefault.exe=/usr/bin/g++-14
12+
compiler.gdefault.name=g++ default (14)
1313

14-
group.clang.compilers=clang13:clang13x86:clang14:clang14x86:clang15:clang15x86:clang16:clang16x86:clang17:clang17x86:clang18:clang18x86:clang19:clang19x86:clangdefault
14+
group.clang.compilers=clang17:clang17x86:clang18:clang18x86:clang19:clang19x86:clangdefault
1515
group.clang.intelAsm=-mllvm --x86-asm-syntax=intel
1616
group.clang.compilerType=clang
17-
compiler.clang13.exe=/usr/bin/clang++-13
18-
compiler.clang13.name=clang 13
19-
compiler.clang13x86.exe=/usr/bin/clang++-13
20-
compiler.clang13x86.name=clang 13 x86
21-
compiler.clang13x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
22-
compiler.clang14.exe=/usr/bin/clang++-14
23-
compiler.clang14.name=clang 14
24-
compiler.clang14x86.exe=/usr/bin/clang++-14
25-
compiler.clang14x86.name=clang 14 x86
26-
compiler.clang14x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
27-
compiler.clang15.exe=/usr/bin/clang++-15
28-
compiler.clang15.name=clang 15
29-
compiler.clang15x86.exe=/usr/bin/clang++-15
30-
compiler.clang15x86.name=clang 15 x86
31-
compiler.clang15x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
32-
compiler.clang16.exe=/usr/bin/clang++-16
33-
compiler.clang16.name=clang 16
34-
compiler.clang16x86.exe=/usr/bin/clang++-16
35-
compiler.clang16x86.name=clang 16 x86
36-
compiler.clang16x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
3717
compiler.clang17.exe=/usr/bin/clang++-17
3818
compiler.clang17.name=clang 17
3919
compiler.clang17x86.exe=/usr/bin/clang++-17
4020
compiler.clang17x86.name=clang 17 x86
41-
compiler.clang17x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
21+
compiler.clang17x86.options=-std=c++17 -Wall -Wextra -Wshadow -O3 -m32 -march=i386
4222
compiler.clang18.exe=/usr/bin/clang++-18
4323
compiler.clang18.name=clang 18
4424
compiler.clang18x86.exe=/usr/bin/clang++-18
4525
compiler.clang18x86.name=clang 18 x86
46-
compiler.clang18x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
26+
compiler.clang18x86.options=-std=c++20 -Wall -Wextra -Wshadow -O3 -m32 -march=i386
4727
compiler.clang19.exe=/usr/bin/clang++-19
4828
compiler.clang19.name=clang 19
4929
compiler.clang19x86.exe=/usr/bin/clang++-19
5030
compiler.clang19x86.name=clang 19 x86
51-
compiler.clang19x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
31+
compiler.clang19x86.options=-std=c++20 -Wall -Wextra -Wshadow -O3 -m32 -march=i386
5232
compiler.clangdefault.exe=/usr/bin/clang++-19
5333
compiler.clangdefault.name=clang default (19)
5434

0 commit comments

Comments
 (0)