Skip to content

Commit b2bf66c

Browse files
authored
Build gcc conan2 (#560)
* Update env for Ubuntu 18 Change base Dockerfile for conan2 install Update compose file for correct targets * Use script for conan install to handler version 1 or 2 Add .gitattributes to standardize shell script EOL on all platforms * Revert back changes for base Dockerfile * Put back Ubuntu distribution to 16
1 parent b37d627 commit b2bf66c

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# shell script file should always have LF only
2+
*.sh text eol=lf

modern/docker-compose.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ services:
7474
build:
7575
context: gcc
7676
dockerfile: Dockerfile
77-
target: gcc-builder
77+
target: builder
7878
args:
7979
<<: [*common-args, *gcc5]
8080
image: ${DOCKER_USERNAME}/gcc5-builder-${DISTRO}:${DOCKER_TAG}
@@ -85,7 +85,7 @@ services:
8585
build:
8686
context: gcc
8787
dockerfile: Dockerfile
88-
target: gcc-builder
88+
target: builder
8989
args:
9090
<<: [*common-args, *gcc6]
9191
image: ${DOCKER_USERNAME}/gcc6-builder-${DISTRO}:${DOCKER_TAG}
@@ -96,7 +96,7 @@ services:
9696
build:
9797
context: gcc
9898
dockerfile: Dockerfile
99-
target: gcc-builder
99+
target: builder
100100
args:
101101
<<: [*common-args, *gcc7]
102102
image: ${DOCKER_USERNAME}/gcc7-builder-${DISTRO}:${DOCKER_TAG}
@@ -107,7 +107,7 @@ services:
107107
build:
108108
context: gcc
109109
dockerfile: Dockerfile
110-
target: gcc-builder
110+
target: builder
111111
args:
112112
<<: [*common-args, *gcc8]
113113
image: ${DOCKER_USERNAME}/gcc8-builder-${DISTRO}:${DOCKER_TAG}
@@ -118,7 +118,7 @@ services:
118118
build:
119119
context: gcc
120120
dockerfile: Dockerfile
121-
target: gcc-builder
121+
target: builder
122122
args:
123123
<<: [*common-args, *gcc9]
124124
image: ${DOCKER_USERNAME}/gcc9-builder-${DISTRO}:${DOCKER_TAG}
@@ -129,7 +129,7 @@ services:
129129
build:
130130
context: gcc
131131
dockerfile: Dockerfile
132-
target: gcc-builder
132+
target: builder
133133
args:
134134
<<: [*common-args, *gcc10]
135135
image: ${DOCKER_USERNAME}/gcc10-builder-${DISTRO}:${DOCKER_TAG}
@@ -140,7 +140,7 @@ services:
140140
build:
141141
context: gcc
142142
dockerfile: Dockerfile
143-
target: gcc-builder
143+
target: builder
144144
args:
145145
<<: [*common-args, *gcc11]
146146
image: ${DOCKER_USERNAME}/gcc11-builder-${DISTRO}:${DOCKER_TAG}
@@ -151,7 +151,7 @@ services:
151151
build:
152152
context: gcc
153153
dockerfile: Dockerfile
154-
target: gcc-builder
154+
target: builder
155155
args:
156156
<<: [*common-args, *gcc12]
157157
image: ${DOCKER_USERNAME}/gcc12-builder-${DISTRO}:${DOCKER_TAG}
@@ -162,7 +162,7 @@ services:
162162
build:
163163
context: gcc
164164
dockerfile: Dockerfile
165-
target: gcc-builder
165+
target: builder
166166
args:
167167
<<: [*common-args, *gcc13]
168168
image: ${DOCKER_USERNAME}/gcc13-builder-${DISTRO}:${DOCKER_TAG}

0 commit comments

Comments
 (0)