lnmch/kops-arm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Docker base images (#212)

Browse Source
This commit is contained in:
Henning Jacobs
2019-03-06 20:57:59 +01:00
committed by GitHub
parent 8efc01d640
commit c1af718c71
4 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.dockerignore Normal file
View File

@@ -0,0 +1,4 @@
*
!Pipfile*
!pip*
!kube_ops_view

4
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM python:3.7-alpine3.8
FROM python:3.7-alpine3.9
WORKDIR /
@@ -13,7 +13,7 @@ RUN /pipenv-install.py && \
apk del python3-dev gcc musl-dev zlib-dev libffi-dev openssl-dev && \
rm -rf /var/cache/apk/* /root/.cache /tmp/*
FROM python:3.7-alpine3.8
FROM python:3.7-alpine3.9
WORKDIR /

4
Makefile
View File

@@ -16,8 +16,8 @@ test:
pipenv run coverage report
appjs:
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.4-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.4-alpine npm run build
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.10-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.10-alpine npm run build
docker: appjs
docker build --build-arg "VERSION=$(VERSION)" -t "$(IMAGE):$(TAG)" .

127
app/package-lock.json generated
View File

@@ -1277,6 +1277,11 @@
"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
"dev": true
},
"bit-twiddle": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bit-twiddle/-/bit-twiddle-1.0.2.tgz",
"integrity": "sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4="
},
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -2512,9 +2517,9 @@
}
},
"earcut": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.4.tgz",
"integrity": "sha512-ttRjmPD5oaTtXOoxhFp9aZvMB14kBjapYaiBuzBB1elOgSLU9P2Ev86G2OClBg+uspUXERsIzXKpUWweH2K4Xg=="
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.5.tgz",
"integrity": "sha1-gpKAqaOg9f7gUp8KR8Pk7/CbIeQ="
},
"electron-to-chromium": {
"version": "1.3.90",
@@ -3059,6 +3064,11 @@
"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
"dev": true
},
"eventemitter3": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
"integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
},
"events": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
@@ -3387,7 +3397,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@@ -3408,12 +3419,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3428,17 +3441,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3555,7 +3571,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@@ -3567,6 +3584,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3581,6 +3599,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3588,12 +3607,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -3612,6 +3633,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3692,7 +3714,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -3704,6 +3727,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@@ -3789,7 +3813,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3825,6 +3850,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3844,6 +3870,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3887,12 +3914,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
@@ -4370,6 +4399,11 @@
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
},
"ismobilejs": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/ismobilejs/-/ismobilejs-0.5.1.tgz",
"integrity": "sha1-Dj+CXinjL4StXdu2Dp4EqJQEZIg="
},
"js-tokens": {
"version": "3.0.2",
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
@@ -5010,8 +5044,7 @@
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"object-copy": {
"version": "0.1.0",
@@ -5234,6 +5267,11 @@
"pbkdf2": "^3.0.3"
}
},
"parse-uri": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-uri/-/parse-uri-1.0.0.tgz",
"integrity": "sha1-KHLcwi8aeXrN4Vg9igrClVLdrCA="
},
"pascalcase": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -5323,45 +5361,18 @@
"integrity": "sha1-i0tcQzsx5Bm8N53FZc4bg1qRs3I="
},
"pixi.js": {
"version": "4.8.3",
"resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-4.8.3.tgz",
"integrity": "sha512-FhczbzbxCXURJWUVL+/rWDFlW7IGuSQfCCD7NDWM+WRs4dQCc9VCBrUWVq87MApt2XqEx8mky5O0Na1wal1MDg==",
"version": "4.8.6",
"resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-4.8.6.tgz",
"integrity": "sha1-3hUFOhdnQTOkj9P+ATikAZove/E=",
"requires": {
"bit-twiddle": "^1.0.2",
"earcut": "^2.1.3",
"earcut": "^2.1.4",
"eventemitter3": "^2.0.0",
"ismobilejs": "^0.4.0",
"ismobilejs": "^0.5.1",
"object-assign": "^4.0.1",
"pixi-gl-core": "^1.1.4",
"remove-array-items": "^1.0.0",
"resource-loader": "^2.1.1"
},
"dependencies": {
"bit-twiddle": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bit-twiddle/-/bit-twiddle-1.0.2.tgz",
"integrity": "sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4="
},
"eventemitter3": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
"integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
},
"ismobilejs": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/ismobilejs/-/ismobilejs-0.4.1.tgz",
"integrity": "sha1-Gl8SbHD+05yT2jgPpiy65XI+fcI="
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"remove-array-items": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.1.0.tgz",
"integrity": "sha512-+YAHWd5patqAM/F4uBsto9h8RXDVxPRrKW46AkbI6eH12OFrN9wlGpkNWYxCjCfwtkidTjaaCXqU634V4mysvw=="
}
"resource-loader": "^2.2.3"
}
},
"pkg-dir": {
@@ -5641,6 +5652,11 @@
}
}
},
"remove-array-items": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.1.1.tgz",
"integrity": "sha1-/XRf9z0IIuVh6pEL8bQB/HhD5pM="
},
"remove-trailing-separator": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -5720,19 +5736,12 @@
"dev": true
},
"resource-loader": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/resource-loader/-/resource-loader-2.2.0.tgz",
"integrity": "sha512-DfFhj7jveciV2fGu0gzJiev9i8mpIIjGiASBpPyUbQCPfNp7rnGF9mPMeJxPWnxNF4N9+NBkTIE1823/AnQy8g==",
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/resource-loader/-/resource-loader-2.2.3.tgz",
"integrity": "sha1-LIsHW3uTKKLnL7pvUbTf8nSHAAA=",
"requires": {
"mini-signals": "^1.1.1",
"parse-uri": "^1.0.0"
},
"dependencies": {
"parse-uri": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-uri/-/parse-uri-1.0.0.tgz",
"integrity": "sha1-KHLcwi8aeXrN4Vg9igrClVLdrCA="
}
}
},
"restore-cursor": {