Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e0e898

Browse files
committed
Rename manylinux images to manylinux1
1 parent8eecfca commit1e0e898

File tree

8 files changed

+73
-72
lines changed

8 files changed

+73
-72
lines changed

‎.circleci/config.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -286,46 +286,46 @@ jobs:
286286
-save_cache:
287287
key:linux-x86-assets-{{ .Revision }}
288288
paths:~/docker/linux-x86.tar
289-
manylinux-x64:
289+
manylinux1-x64:
290290
<<:*build-settings
291291
steps:
292292
-restore_cache:
293293
key:base-assets-{{ .Revision }}
294294
-run:
295-
name:manylinux-x64 build
295+
name:manylinux1-x64 build
296296
no_output_timeout:1.5h
297297
command:|
298298
docker load -i ~/docker/base.tar
299-
makemanylinux-x64
300-
tagged=$(docker images -q -f 'since=dockcross/manylinux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux-x64)
301-
docker save -o ~/docker/manylinux-x64.tar dockcross/manylinux-x64:latest $tagged
299+
makemanylinux1-x64
300+
tagged=$(docker images -q -f 'since=dockcross/manylinux1-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux1-x64)
301+
docker save -o ~/docker/manylinux1-x64.tar dockcross/manylinux1-x64:latest $tagged
302302
-run:
303-
name:manylinux-x64 test
303+
name:manylinux1-x64 test
304304
command:|
305-
makemanylinux-x64.test
305+
makemanylinux1-x64.test
306306
-save_cache:
307-
key:manylinux-x64-assets-{{ .Revision }}
308-
paths:~/docker/manylinux-x64.tar
309-
manylinux-x86:
307+
key:manylinux1-x64-assets-{{ .Revision }}
308+
paths:~/docker/manylinux1-x64.tar
309+
manylinux1-x86:
310310
<<:*build-settings
311311
steps:
312312
-restore_cache:
313313
key:base-assets-{{ .Revision }}
314314
-run:
315-
name:manylinux-x86 build
315+
name:manylinux1-x86 build
316316
no_output_timeout:1.5h
317317
command:|
318318
docker load -i ~/docker/base.tar
319-
makemanylinux-x86
320-
tagged=$(docker images -q -f 'since=dockcross/manylinux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux-x86)
321-
docker save -o ~/docker/manylinux-x86.tar dockcross/manylinux-x86:latest $tagged
319+
makemanylinux1-x86
320+
tagged=$(docker images -q -f 'since=dockcross/manylinux1-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux1-x86)
321+
docker save -o ~/docker/manylinux1-x86.tar dockcross/manylinux1-x86:latest $tagged
322322
-run:
323-
name:manylinux-x86 test
323+
name:manylinux1-x86 test
324324
command:|
325-
makemanylinux-x86.test
325+
makemanylinux1-x86.test
326326
-save_cache:
327-
key:manylinux-x86-assets-{{ .Revision }}
328-
paths:~/docker/manylinux-x86.tar
327+
key:manylinux1-x86-assets-{{ .Revision }}
328+
paths:~/docker/manylinux1-x86.tar
329329
windows-static-x64:
330330
<<:*build-settings
331331
steps:
@@ -618,27 +618,27 @@ jobs:
618618
docker push $tagged
619619
fi
620620
-restore_cache:
621-
key:manylinux-x64-assets-{{ .Revision }}
621+
key:manylinux1-x64-assets-{{ .Revision }}
622622
-deploy:
623-
name:Deploymanylinux-x64
623+
name:Deploymanylinux1-x64
624624
command:|
625-
docker load -i ~/docker/manylinux-x64.tar
625+
docker load -i ~/docker/manylinux1-x64.tar
626626
if [ "${CIRCLE_BRANCH}" == "master" ]; then
627627
docker login -u $DOCKER_USER -p $DOCKER_PASS
628-
docker push dockcross/manylinux-x64:latest
629-
tagged=$(docker images -q -f 'since=dockcross/manylinux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux-x64)
628+
docker push dockcross/manylinux1-x64:latest
629+
tagged=$(docker images -q -f 'since=dockcross/manylinux1-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux1-x64)
630630
docker push $tagged
631631
fi
632632
-restore_cache:
633-
key:manylinux-x86-assets-{{ .Revision }}
633+
key:manylinux1-x86-assets-{{ .Revision }}
634634
-deploy:
635-
name:Deploymanylinux-x86
635+
name:Deploymanylinux1-x86
636636
command:|
637-
docker load -i ~/docker/manylinux-x86.tar
637+
docker load -i ~/docker/manylinux1-x86.tar
638638
if [ "${CIRCLE_BRANCH}" == "master" ]; then
639639
docker login -u $DOCKER_USER -p $DOCKER_PASS
640-
docker push dockcross/manylinux-x86:latest
641-
tagged=$(docker images -q -f 'since=dockcross/manylinux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux-x86)
640+
docker push dockcross/manylinux1-x86:latest
641+
tagged=$(docker images -q -f 'since=dockcross/manylinux1-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grepmanylinux1-x86)
642642
docker push $tagged
643643
fi
644644
-restore_cache:
@@ -760,10 +760,10 @@ workflows:
760760
-linux-x86:
761761
requires:
762762
-base
763-
-manylinux-x64:
763+
-manylinux1-x64:
764764
requires:
765765
-base
766-
-manylinux-x86:
766+
-manylinux1-x86:
767767
requires:
768768
-base
769769
-windows-static-x64:
@@ -801,8 +801,8 @@ workflows:
801801
#- linux-ppc64le
802802
-linux-x64
803803
-linux-x86
804-
-manylinux-x64
805-
-manylinux-x86
804+
-manylinux1-x64
805+
-manylinux1-x86
806806
-windows-static-x64
807807
-windows-static-x64-posix
808808
-windows-static-x86

‎Makefile‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ DOCKER = docker
99
# Docker organization to pull the images from
1010
ORG = dockcross
1111

12-
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux-x64)
12+
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux1-x64)
1313
BIN = ./bin
1414

1515
# These images are built using the "build implicit rule"
1616
STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-armv7a linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
1717

1818
# Generated Dockerfiles.
19-
GEN_IMAGES = linux-s390x linux-mipsmanylinux-x86manylinux-x64 web-wasm linux-arm64 windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv5
19+
GEN_IMAGES = linux-s390x linux-mipsmanylinux1-x86manylinux1-x64 web-wasm linux-arm64 windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv5
2020
GEN_IMAGE_DOCKERFILES =$(addsuffix /Dockerfile,$(GEN_IMAGES))
2121

2222
# These images are expected to have explicit rules for *both* build and testing
23-
NON_STANDARD_IMAGES = web-wasmmanylinux-x64manylinux-x86
23+
NON_STANDARD_IMAGES = web-wasmmanylinux1-x64manylinux1-x86
2424

2525
DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows
2626

@@ -98,53 +98,54 @@ web-wasm.test: web-wasm
9898
rm -rf web-wasm/test
9999

100100
#
101-
# manylinux-x64
101+
# manylinux1-x64
102+
#
102103

103-
manylinux-x64:manylinux-x64/Dockerfile
104+
manylinux1-x64:manylinux1-x64/Dockerfile
104105
mkdir -p$@/imagefiles&& cp -r imagefiles$@/
105-
$(DOCKER) build -t$(ORG)/manylinux-x64:latest\
106-
--build-arg IMAGE=$(ORG)/manylinux-x64\
106+
$(DOCKER) build -t$(ORG)/manylinux1-x64:latest\
107+
--build-arg IMAGE=$(ORG)/manylinux1-x64\
107108
--build-arg VCS_REF=`git rev-parse --short HEAD`\
108109
--build-arg VCS_URL=`git config --get remote.origin.url`\
109110
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`\
110-
-fmanylinux-x64/Dockerfile.
111-
$(DOCKER) build -t$(ORG)/manylinux-x64:$(TAG)\
112-
--build-arg IMAGE=$(ORG)/manylinux-x64\
111+
-fmanylinux1-x64/Dockerfile.
112+
$(DOCKER) build -t$(ORG)/manylinux1-x64:$(TAG)\
113+
--build-arg IMAGE=$(ORG)/manylinux1-x64\
113114
--build-arg VERSION=$(TAG)\
114115
--build-arg VCS_REF=`git rev-parse --short HEAD`\
115116
--build-arg VCS_URL=`git config --get remote.origin.url`\
116117
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`\
117-
-fmanylinux-x64/Dockerfile.
118+
-fmanylinux1-x64/Dockerfile.
118119
rm -rf$@/imagefiles
119120

120-
manylinux-x64.test:manylinux-x64
121-
$(DOCKER) run$(RM) dockcross/manylinux-x64>$(BIN)/dockcross-manylinux-x64&& chmod +x$(BIN)/dockcross-manylinux-x64
122-
$(BIN)/dockcross-manylinux-x64 /opt/python/cp35-cp35m/bin/python test/run.py
121+
manylinux1-x64.test:manylinux1-x64
122+
$(DOCKER) run$(RM) dockcross/manylinux1-x64>$(BIN)/dockcross-manylinux1-x64&& chmod +x$(BIN)/dockcross-manylinux1-x64
123+
$(BIN)/dockcross-manylinux1-x64 /opt/python/cp35-cp35m/bin/python test/run.py
123124

124125
#
125-
#manylinux-x86
126+
#manylinux1-x86
126127
#
127128

128-
manylinux-x86:manylinux-x86/Dockerfile
129+
manylinux1-x86:manylinux1-x86/Dockerfile
129130
mkdir -p$@/imagefiles&& cp -r imagefiles$@/
130-
$(DOCKER) build -t$(ORG)/manylinux-x86:latest\
131-
--build-arg IMAGE=$(ORG)/manylinux-x86\
131+
$(DOCKER) build -t$(ORG)/manylinux1-x86:latest\
132+
--build-arg IMAGE=$(ORG)/manylinux1-x86\
132133
--build-arg VCS_REF=`git rev-parse --short HEAD`\
133134
--build-arg VCS_URL=`git config --get remote.origin.url`\
134135
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`\
135-
-fmanylinux-x86/Dockerfile.
136-
$(DOCKER) build -t$(ORG)/manylinux-x86:$(TAG)\
137-
--build-arg IMAGE=$(ORG)/manylinux-x86\
136+
-fmanylinux1-x86/Dockerfile.
137+
$(DOCKER) build -t$(ORG)/manylinux1-x86:$(TAG)\
138+
--build-arg IMAGE=$(ORG)/manylinux1-x86\
138139
--build-arg VERSION=$(TAG)\
139140
--build-arg VCS_REF=`git rev-parse --short HEAD`\
140141
--build-arg VCS_URL=`git config --get remote.origin.url`\
141142
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`\
142-
-fmanylinux-x86/Dockerfile.
143+
-fmanylinux1-x86/Dockerfile.
143144
rm -rf$@/imagefiles
144145

145-
manylinux-x86.test:manylinux-x86
146-
$(DOCKER) run$(RM) dockcross/manylinux-x86>$(BIN)/dockcross-manylinux-x86&& chmod +x$(BIN)/dockcross-manylinux-x86
147-
$(BIN)/dockcross-manylinux-x86 /opt/python/cp35-cp35m/bin/python test/run.py
146+
manylinux1-x86.test:manylinux1-x86
147+
$(DOCKER) run$(RM) dockcross/manylinux1-x86>$(BIN)/dockcross-manylinux1-x86&& chmod +x$(BIN)/dockcross-manylinux1-x86
148+
$(BIN)/dockcross-manylinux1-x86 /opt/python/cp35-cp35m/bin/python test/run.py
148149

149150
#
150151
# base

‎README.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,19 @@ dockcross/linux-x86
182182
|linux-x86-images| Linux i686 cross compiler.
183183

184184

185-
.. |manylinux-x64-images|image::https://images.microbadger.com/badges/image/dockcross/manylinux-x64.svg
186-
:target:https://microbadger.com/images/dockcross/manylinux-x64
185+
.. |manylinux1-x64-images|image::https://images.microbadger.com/badges/image/dockcross/manylinux1-x64.svg
186+
:target:https://microbadger.com/images/dockcross/manylinux1-x64
187187

188-
dockcross/manylinux-x64
189-
|manylinux-x64-images| Docker `manylinux<https://github.com/pypa/manylinux>`_ image for building Linux x86_64 / amd64 `Python wheel packages<http://pythonwheels.com/>`_. It includes Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.
188+
dockcross/manylinux1-x64
189+
|manylinux1-x64-images| Docker `manylinux1<https://github.com/pypa/manylinux/tree/manylinux1>`_ image for building Linux x86_64 / amd64 `Python wheel packages<http://pythonwheels.com/>`_. It includes Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.
190190
Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build<http://scikit-build.org>`_
191191

192192

193-
.. |manylinux-x86-images|image::https://images.microbadger.com/badges/image/dockcross/manylinux-x86.svg
194-
:target:https://microbadger.com/images/dockcross/manylinux-x86
193+
.. |manylinux1-x86-images|image::https://images.microbadger.com/badges/image/dockcross/manylinux1-x86.svg
194+
:target:https://microbadger.com/images/dockcross/manylinux1-x86
195195

196-
dockcross/manylinux-x86
197-
|manylinux-x86-images| Docker `manylinux<https://github.com/pypa/manylinux>`_ image for building Linux i686 `Python wheel packages<http://pythonwheels.com/>`_. It includes Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.
196+
dockcross/manylinux1-x86
197+
|manylinux1-x86-images| Docker `manylinux1<https://github.com/pypa/manylinux/tree/manylinux1>`_ image for building Linux i686 `Python wheel packages<http://pythonwheels.com/>`_. It includes Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.
198198
Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build<http://scikit-build.org>`_
199199

200200

‎common.docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY \
1818
/buildscripts/
1919

2020
RUN \
21-
X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ] && echo "-32" || echo "") && \
21+
X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux1-x86" ] && echo "-32" || echo "") && \
2222
/buildscripts/build-and-install-openssl.sh $X86_FLAG && \
2323
/buildscripts/build-and-install-openssh.sh && \
2424
/buildscripts/build-and-install-curl.sh && \
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM scikitbuild/manylinux1_x86_64:91cb02fb8
22
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
33

4-
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x64
4+
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
55

66
#include "common.manylinux"
77

@@ -19,12 +19,12 @@ ENV AS=${CROSS_ROOT}/as \
1919

2020
COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
2121

22-
COPYmanylinux-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
22+
COPYmanylinux1-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
2323
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
2424

2525
# Build-time metadata as defined at http://label-schema.org
2626
ARG BUILD_DATE
27-
ARG IMAGE=dockcross/manylinux-x64
27+
ARG IMAGE=dockcross/manylinux1-x64
2828
ARG VERSION=latest
2929
ARG VCS_REF
3030
ARG VCS_URL
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM scikitbuild/manylinux1_i686:91cb02fb8
22
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
33

4-
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x86
4+
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
55

66
#include "common.manylinux"
77

@@ -19,15 +19,15 @@ ENV AS=${CROSS_ROOT}/as \
1919

2020
COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
2121

22-
COPYmanylinux-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
22+
COPYmanylinux1-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
2323
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
2424

2525
COPY linux-x86/linux32-entrypoint.sh /dockcross/
2626
ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
2727

2828
# Build-time metadata as defined at http://label-schema.org
2929
ARG BUILD_DATE
30-
ARG IMAGE=dockcross/manylinux-x86
30+
ARG IMAGE=dockcross/manylinux1-x86
3131
ARG VERSION=latest
3232
ARG VCS_REF
3333
ARG VCS_URL

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp