Skip to content

Commit 21ba611

Browse files
authored
Merge pull request #80 from bcbi/dpa/parent-image
Document the `parent_image` keyword argument
2 parents 310b41b + 0592fb9 commit 21ba611

4 files changed

Lines changed: 101 additions & 6 deletions

File tree

.github/workflows/predictmd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
arch: ${{ matrix.arch }}
2929
- uses: julia-actions/julia-buildpkg@latest
3030
- uses: julia-actions/julia-runtest@latest
31-
- run: julia --project -e 'import SimpleContainerGenerator; pkgs = [(name = "PredictMD", rev = "master", ), (name = "PredictMDExtra", rev = "master", ), (name = "PredictMDFull", rev = "master", ), (name = "UnicodePlots", version = "1.2.0 - *", ),]; no_test = String["UnicodePlots"]; SimpleContainerGenerator.create_dockerfile(pkgs; no_test = no_test)'
31+
- run: julia --project -e 'import SimpleContainerGenerator; pkgs = [(name = "PredictMD", rev = "master", ), (name = "PredictMDExtra", rev = "master", ), (name = "PredictMDFull", rev = "master", ), (name = "UnicodePlots", version = "1.2.0 - *", ),]; no_test = String["UnicodePlots"]; parent_image = "nvidia/cuda"; SimpleContainerGenerator.create_dockerfile(pkgs; no_test = no_test, parent_image = parent_image)'
3232
- if: github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'schedule')
3333
env:
3434
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "SimpleContainerGenerator"
22
uuid = "b8d349fb-717b-4aac-a9b1-e1da4219c631"
33
authors = ["Dilum Aluthge"]
4-
version = "1.1.1"
4+
version = "1.2.0"
55

66
[deps]
77
PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"

README.md

Lines changed: 98 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ pkgs = [
3333
"Bar",
3434
"Baz",
3535
]
36+
julia_version = v"1.4.0"
37+
38+
SimpleContainerGenerator.create_dockerfile(pkgs,
39+
pwd();
40+
julia_version = julia_version)
3641

37-
SimpleContainerGenerator.create_dockerfile(pkgs, pwd(); julia_version = v"1.4.0")
3842
run(`docker build -t my_docker_username/my_image_name .`)
3943
```
4044

@@ -51,8 +55,12 @@ pkgs = [
5155
(name = "Bar",),
5256
(name = "Baz",),
5357
]
58+
julia_version = v"1.4.0"
59+
60+
SimpleContainerGenerator.create_dockerfile(pkgs,
61+
pwd();
62+
julia_version = julia_version)
5463

55-
SimpleContainerGenerator.create_dockerfile(pkgs, pwd(); julia_version = v"1.4.0")
5664
run(`docker build -t my_docker_username/my_image_name .`)
5765
```
5866

@@ -69,8 +77,12 @@ pkgs = [
6977
(name = "Bar", version = "4.5.6",), # and replace the version numbers with actual version numbers for the packages
7078
(name = "Baz", version = "7.8.9",),
7179
]
80+
julia_version = v"1.4.0"
81+
82+
SimpleContainerGenerator.create_dockerfile(pkgs,
83+
pwd();
84+
julia_version = julia_version)
7285

73-
SimpleContainerGenerator.create_dockerfile(pkgs, pwd(); julia_version = v"1.4.0")
7486
run(`docker build -t my_docker_username/my_image_name .`)
7587
```
7688

@@ -87,8 +99,90 @@ pkgs = [
8799
(name = "Bar", version = "4.5.6",), # and replace the version numbers with actual version numbers for the packages
88100
(name = "Baz", rev = "master",), # and replace "master" with the name of the branch you want to use
89101
]
102+
julia_version = v"1.4.0"
103+
104+
SimpleContainerGenerator.create_dockerfile(pkgs,
105+
pwd();
106+
julia_version = julia_version)
107+
108+
run(`docker build -t my_docker_username/my_image_name .`)
109+
```
110+
111+
### Example 5
112+
113+
```julia
114+
import SimpleContainerGenerator
115+
116+
mkpath("my_image_name")
117+
cd("my_image_name")
118+
119+
pkgs = [
120+
"Foo", # Replace Foo, Bar, Baz, etc. with the names of actual packages that you want to use
121+
"Bar",
122+
"Baz",
123+
]
124+
no_test = [
125+
"Foo", # Replace Foo, etc. with the names of actual packages
126+
]
127+
exclude_packages_from_sysimage = [
128+
"Bar", # Replace Bar, etc. with the names of actual packages
129+
]
130+
julia_version = v"1.4.0"
131+
132+
SimpleContainerGenerator.create_dockerfile(pkgs,
133+
pwd();
134+
julia_version = julia_version,
135+
no_test = no_test,
136+
exclude_packages_from_sysimage = exclude_packages_from_sysimage)
137+
138+
run(`docker build -t my_docker_username/my_image_name .`)
139+
```
140+
141+
### Example 6
142+
143+
```julia
144+
import SimpleContainerGenerator
145+
146+
mkpath("my_image_name")
147+
cd("my_image_name")
148+
149+
pkgs = [
150+
"Foo", # Replace Foo, Bar, Baz, etc. with the names of actual packages that you want to use
151+
"Bar",
152+
"Baz",
153+
]
154+
julia_version = v"1.4.0"
155+
parent_image = "ubuntu:latest"
156+
157+
SimpleContainerGenerator.create_dockerfile(pkgs,
158+
pwd();
159+
julia_version = julia_version,
160+
parent_image = parent_image)
161+
162+
run(`docker build -t my_docker_username/my_image_name .`)
163+
```
164+
165+
### Example 7
166+
167+
```julia
168+
import SimpleContainerGenerator
169+
170+
mkpath("my_image_name")
171+
cd("my_image_name")
172+
173+
pkgs = [
174+
"Foo", # Replace Foo, Bar, Baz, etc. with the names of actual packages that you want to use
175+
"Bar",
176+
"Baz",
177+
]
178+
julia_version = v"1.4.0"
179+
parent_image = "nvidia/cuda:latest"
180+
181+
SimpleContainerGenerator.create_dockerfile(pkgs,
182+
pwd();
183+
julia_version = julia_version,
184+
parent_image = parent_image)
90185

91-
SimpleContainerGenerator.create_dockerfile(pkgs, pwd(); julia_version = v"1.4.0")
92186
run(`docker build -t my_docker_username/my_image_name .`)
93187
```
94188

src/public_create_dockerfile.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const _create_dockerfile_kwargs_docstring = """
88
- `julia_version::Union{String, VersionNumber}`
99
- `make_sysimage::Bool`
1010
- `no_test::Vector{String}`
11+
- `parent_image::String`
1112
1213
### Advanced Keyword Arguments
1314
- `override_default_apt::Vector{String}`

0 commit comments

Comments
 (0)