Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
afa0fed385 | |||
c507405605 | |||
0d9941fb09 | |||
24f7eef3af | |||
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 |
@ -1,13 +1,13 @@
|
|||||||
# gitzone custom
|
# gitzone custom
|
||||||
image: docker:19.03.1
|
image: docker:20.10.8
|
||||||
services:
|
services:
|
||||||
- docker:stable-dind
|
- docker:stable-dind
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- apk update
|
- apk update
|
||||||
- apk add --no-cache git openssl ca-certificates bash curl
|
- 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 make gcc g++ python3 py3-pip linux-headers paxctl
|
||||||
- apk add --no-cache libgcc libstdc++ gnupg nodejs-current nodejs-npm
|
- apk add --no-cache libgcc libstdc++ gnupg nodejs-current npm
|
||||||
- update-ca-certificates
|
- update-ca-certificates
|
||||||
- cp ./stack-fix.c /lib/
|
- cp ./stack-fix.c /lib/
|
||||||
- set -ex
|
- set -ex
|
||||||
|
24
Dockerfile
24
Dockerfile
@ -1,28 +1,38 @@
|
|||||||
FROM docker:19.03.1
|
FROM docker:20.10.8
|
||||||
|
|
||||||
RUN apk update && apk add --no-cache \
|
RUN apk update && apk add --no-cache \
|
||||||
git \
|
git \
|
||||||
openssl \
|
openssl \
|
||||||
|
openssl-dev \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
bash \
|
bash \
|
||||||
curl \
|
curl \
|
||||||
make \
|
make \
|
||||||
gcc \
|
gcc \
|
||||||
g++ \
|
g++ \
|
||||||
python \
|
python3 \
|
||||||
|
python3-dev \
|
||||||
|
py3-pip \
|
||||||
linux-headers \
|
linux-headers \
|
||||||
paxctl \
|
paxctl \
|
||||||
libgcc \
|
libgcc \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
gnupg \
|
gnupg \
|
||||||
nodejs-current \
|
nodejs-current \
|
||||||
nodejs-npm \
|
npm \
|
||||||
krb5-libs \
|
krb5-libs \
|
||||||
&& update-ca-certificates
|
&& update-ca-certificates \
|
||||||
|
rust \
|
||||||
|
docker-cli \
|
||||||
|
libffi-dev \
|
||||||
|
libc-dev \
|
||||||
|
docker-compose
|
||||||
|
|
||||||
# Add the patch fix
|
# Add the patch fix
|
||||||
COPY ./stack-fix.c /lib/
|
COPY ./stack-fix.c /lib/
|
||||||
|
|
||||||
|
RUN node -v && npm -v
|
||||||
|
|
||||||
# Prepare the libraries packages
|
# Prepare the libraries packages
|
||||||
RUN set -ex \
|
RUN set -ex \
|
||||||
&& apk add --no-cache --virtual .build-deps build-base \
|
&& apk add --no-cache --virtual .build-deps build-base \
|
||||||
@ -33,9 +43,3 @@ RUN set -ex \
|
|||||||
ENV LD_PRELOAD /lib/stack-fix.so
|
ENV LD_PRELOAD /lib/stack-fix.so
|
||||||
|
|
||||||
RUN npm config set unsafe-perm true
|
RUN npm config set unsafe-perm true
|
||||||
RUN apk update && \
|
|
||||||
apk add --no-cache docker-cli rust 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",
|
"name": "ht-docker-dbase",
|
||||||
"version": "1.0.67",
|
"version": "1.0.82",
|
||||||
"lockfileVersion": 1
|
"lockfileVersion": 1
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ht-docker-dbase",
|
"name": "ht-docker-dbase",
|
||||||
"version": "1.0.67",
|
"version": "1.0.82",
|
||||||
"description": "easy CI for docker images",
|
"description": "easy CI for docker images",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"directories": {
|
"directories": {
|
||||||
|
Reference in New Issue
Block a user