Compare commits
57 Commits
Author | SHA1 | Date | |
---|---|---|---|
c719f6a14b | |||
03a3ecdf7b | |||
4b8cbc0fba | |||
1f0c39da64 | |||
4e426e7bf7 | |||
bbd13b879f | |||
1f12882f03 | |||
e4aed1d051 | |||
3bba9c114b | |||
ee1769f6aa | |||
7b79104520 | |||
ee8ad96796 | |||
15e001b126 | |||
8d6415f5d0 | |||
50845053ad | |||
2ff559917d | |||
cf21b33831 | |||
c2a493ae5a | |||
eef4ab8ca3 | |||
01ac9b637d | |||
181d0ff6d7 | |||
0d06199c58 | |||
7aa27daebc | |||
6671bdd6a6 | |||
36d3466a48 | |||
62b9a1574d | |||
617c9f993f | |||
6f91132d22 | |||
e4d88c1732 | |||
f5cc4d4339 | |||
665c7aaada | |||
a47ab357f7 | |||
a8a72799b5 | |||
f1a516dfb5 | |||
60afae8582 | |||
e8ad105aed | |||
65cdb2c53a | |||
05fd503a20 | |||
29e987c20e | |||
1fee89324c | |||
abf5c60429 | |||
90a0574d10 | |||
046862d402 | |||
4d578e69d5 | |||
b68d149ac4 | |||
a907fbb334 | |||
25c7a6dc49 | |||
0c3ce8b6d7 | |||
fccaeeb47c | |||
d806a0db1d | |||
bdffd6452c | |||
1248416ed9 | |||
9651c1a889 | |||
f6809ac84a | |||
c61c4499a4 | |||
f23c44906c | |||
39b54a483f |
@ -1,13 +1,13 @@
|
||||
# gitzone custom
|
||||
image: docker:19.03.1
|
||||
image: docker:20.10.8
|
||||
services:
|
||||
- docker:stable-dind
|
||||
|
||||
before_script:
|
||||
- apk update
|
||||
- apk add --no-cache git openssl ca-certificates bash curl
|
||||
- apk add --no-cache make gcc g++ python linux-headers paxctl
|
||||
- apk add --no-cache libgcc libstdc++ gnupg nodejs nodejs-npm
|
||||
- apk add --no-cache make gcc g++ python3 py3-pip linux-headers paxctl
|
||||
- apk add --no-cache libgcc libstdc++ gnupg nodejs-current npm
|
||||
- update-ca-certificates
|
||||
- cp ./stack-fix.c /lib/
|
||||
- set -ex
|
||||
@ -16,8 +16,9 @@ before_script:
|
||||
- apk del .build-deps
|
||||
- export LD_PRELOAD="/lib/stack-fix.so"
|
||||
- npm config set unsafe-perm true
|
||||
- node -v && npm -v
|
||||
- npm install -g @shipzone/npmci
|
||||
- # npmci npm prepare
|
||||
- npmci npm prepare
|
||||
|
||||
stages:
|
||||
- release
|
||||
|
18
Dockerfile
18
Dockerfile
@ -1,4 +1,4 @@
|
||||
FROM docker:19.03.1
|
||||
FROM docker:20.10.8
|
||||
|
||||
RUN apk update && apk add --no-cache \
|
||||
git \
|
||||
@ -9,20 +9,23 @@ RUN apk update && apk add --no-cache \
|
||||
make \
|
||||
gcc \
|
||||
g++ \
|
||||
python \
|
||||
python3 \
|
||||
py3-pip \
|
||||
linux-headers \
|
||||
paxctl \
|
||||
libgcc \
|
||||
libstdc++ \
|
||||
gnupg \
|
||||
nodejs \
|
||||
nodejs-npm \
|
||||
nodejs-current \
|
||||
npm \
|
||||
krb5-libs \
|
||||
&& update-ca-certificates
|
||||
|
||||
# Add the patch fix
|
||||
COPY ./stack-fix.c /lib/
|
||||
|
||||
RUN node -v && npm -v
|
||||
|
||||
# Prepare the libraries packages
|
||||
RUN set -ex \
|
||||
&& apk add --no-cache --virtual .build-deps build-base \
|
||||
@ -33,3 +36,10 @@ RUN set -ex \
|
||||
ENV LD_PRELOAD /lib/stack-fix.so
|
||||
|
||||
RUN npm config set unsafe-perm true
|
||||
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
|
||||
RUN apk update && \
|
||||
apk add --no-cache docker-cli python3 && \
|
||||
apk add --no-cache --virtual .docker-compose-deps python3-dev libffi-dev openssl-dev gcc libc-dev make && \
|
||||
pip3 install docker-compose && \
|
||||
apk del .docker-compose-deps
|
||||
|
||||
|
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "ht-docker-dbase",
|
||||
"version": "1.0.51",
|
||||
"version": "1.0.80",
|
||||
"lockfileVersion": 1
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ht-docker-dbase",
|
||||
"version": "1.0.51",
|
||||
"version": "1.0.80",
|
||||
"description": "easy CI for docker images",
|
||||
"main": "index.js",
|
||||
"directories": {
|
||||
|
Reference in New Issue
Block a user