File tree Expand file tree Collapse file tree 4 files changed +13
-12
lines changed Expand file tree Collapse file tree 4 files changed +13
-12
lines changed Original file line number Diff line number Diff line change 22
22
password : ${{ secrets.DOCKER_PASSWORD }}
23
23
repository : matthewfeickert/pythia-python
24
24
dockerfile : Dockerfile
25
- tags : latest,pythia8.307 ,pythia8.307 -hepmc2.06.11-fastjet3.4.0-python3.10
25
+ tags : latest,pythia8.308 ,pythia8.308 -hepmc2.06.11-fastjet3.4.0-python3.10
26
26
- name : Build and Publish to Registry with Release Tag
27
27
if : startsWith(github.ref, 'refs/tags/')
28
28
uses : docker/build-push-action@v1
31
31
password : ${{ secrets.DOCKER_PASSWORD }}
32
32
repository : matthewfeickert/pythia-python
33
33
dockerfile : Dockerfile
34
- tags : latest,latest-stable,pythia8.307 ,pythia8.307 -hepmc2.06.11-fastjet3.4.0-python3.10
34
+ tags : latest,latest-stable,pythia8.308 ,pythia8.308 -hepmc2.06.11-fastjet3.4.0-python3.10
35
35
tag_with_ref : true
Original file line number Diff line number Diff line change @@ -62,6 +62,7 @@ RUN mkdir /code && \
62
62
./configure \
63
63
--prefix=/usr/local/venv && \
64
64
make -j$(nproc --ignore=1) && \
65
+ make check && \
65
66
make install && \
66
67
rm -rf /code
67
68
@@ -83,15 +84,15 @@ RUN mkdir /code && \
83
84
rm -rf /code
84
85
85
86
# Install PYTHIA
86
- ARG PYTHIA_VERSION=8307
87
+ ARG PYTHIA_VERSION=8308
87
88
# PYTHON_VERSION already exists in the base image
88
89
RUN mkdir /code && \
89
90
cd /code && \
90
91
wget --quiet "https://pythia.org/download/pythia${PYTHIA_VERSION:0:2}/pythia${PYTHIA_VERSION}.tgz" && \
91
92
tar xvfz pythia${PYTHIA_VERSION}.tgz && \
92
93
cd pythia${PYTHIA_VERSION} && \
93
94
./configure --help && \
94
- export PYTHON_MINOR_VERSION=${PYTHON_VERSION%.*} && \
95
+ export PYTHON_MINOR_VERSION=" ${PYTHON_VERSION%.*}" && \
95
96
./configure \
96
97
--prefix=/usr/local/venv \
97
98
--arch=Linux \
@@ -106,7 +107,7 @@ RUN mkdir /code && \
106
107
--with-python-include=/usr/local/include/python${PYTHON_MINOR_VERSION} \
107
108
--cxx-common="-O2 -m64 -pedantic -W -Wall -Wshadow -fPIC -std=c++17" \
108
109
--cxx-shared="-shared -std=c++17" && \
109
- make -j $(nproc --ignore=1) && \
110
+ make --jobs $(nproc --ignore=1) && \
110
111
make install && \
111
112
rm -rf /code
112
113
Original file line number Diff line number Diff line change 9
9
--build-arg HEPMC_VERSION=2.06.11 \
10
10
--build-arg LHAPDF_VERSION=6.5.3 \
11
11
--build-arg FASTJET_VERSION=3.4.0 \
12
- --build-arg PYTHIA_VERSION=8307 \
13
- --tag matthewfeickert/pythia-python:pythia8.307 \
14
- --tag matthewfeickert/pythia-python:pythia8.307 -hepmc2.06.11-fastjet3.4.0-python3.10 \
12
+ --build-arg PYTHIA_VERSION=8308 \
13
+ --tag matthewfeickert/pythia-python:pythia8.308 \
14
+ --tag matthewfeickert/pythia-python:pythia8.308 -hepmc2.06.11-fastjet3.4.0-python3.10 \
15
15
--tag matthewfeickert/pythia-python:latest
16
16
17
17
run :
Original file line number Diff line number Diff line change @@ -15,15 +15,15 @@ The Docker image contains:
15
15
* [ HepMC2] ( http://hepmc.web.cern.ch/hepmc/ ) ` v2.06.11 `
16
16
* [ LHAPDF] ( https://lhapdf.hepforge.org/ ) ` v6.5.3 `
17
17
* [ FastJet] ( http://fastjet.fr/ ) ` v3.4.0 `
18
- * [ PYTHIA] ( https://pythia.org/ ) ` v8.307 `
18
+ * [ PYTHIA] ( https://pythia.org/ ) ` v8.308 `
19
19
20
20
## Installation
21
21
22
22
- Check the [ list of available tags on Docker Hub] ( https://hub.docker.com/r/matthewfeickert/pythia-python/tags?page=1 ) to find the tag you want.
23
23
- Use ` docker pull ` to pull down the image corresponding to the tag. For example:
24
24
25
25
```
26
- docker pull matthewfeickert/pythia-python:pythia8.307
26
+ docker pull matthewfeickert/pythia-python:pythia8.308
27
27
```
28
28
29
29
## Use
@@ -35,7 +35,7 @@ docker run \
35
35
--rm \
36
36
--user $(id -u $USER):$(id -g) \
37
37
--volume $PWD:/work \
38
- matthewfeickert/pythia-python:pythia8.307 \
38
+ matthewfeickert/pythia-python:pythia8.308 \
39
39
'python tests/main01.py > main01_out_py.txt'
40
40
```
41
41
@@ -46,7 +46,7 @@ docker run \
46
46
--rm \
47
47
--user $(id -u $USER):$(id -g) \
48
48
--volume $PWD:/work \
49
- matthewfeickert/pythia-python:pythia8.307 \
49
+ matthewfeickert/pythia-python:pythia8.308 \
50
50
'g++ tests/main01.cc -o tests/main01 $(pythia8-config --ldflags); ./tests/main01 > main01_out_cpp.txt'
51
51
```
52
52
You can’t perform that action at this time.
0 commit comments