Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
0d9941fb09 | |||
24f7eef3af | |||
c719f6a14b | |||
03a3ecdf7b | |||
4b8cbc0fba | |||
1f0c39da64 |
@ -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-current 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
|
||||
@ -27,6 +27,7 @@ stages:
|
||||
release:
|
||||
stage: release
|
||||
script:
|
||||
- npmci node install stable
|
||||
- npmci docker login
|
||||
- npmci docker build
|
||||
- npmci docker test
|
||||
|
14
Dockerfile
14
Dockerfile
@ -3,13 +3,16 @@ FROM docker:20.10.8
|
||||
RUN apk update && apk add --no-cache \
|
||||
git \
|
||||
openssl \
|
||||
openssl-dev \
|
||||
ca-certificates \
|
||||
bash \
|
||||
curl \
|
||||
make \
|
||||
gcc \
|
||||
g++ \
|
||||
python \
|
||||
python3 \
|
||||
python3-dev \
|
||||
py3-pip \
|
||||
linux-headers \
|
||||
paxctl \
|
||||
libgcc \
|
||||
@ -18,7 +21,11 @@ RUN apk update && apk add --no-cache \
|
||||
nodejs-current \
|
||||
npm \
|
||||
krb5-libs \
|
||||
&& update-ca-certificates
|
||||
&& update-ca-certificates \
|
||||
rust \
|
||||
docker-cli \
|
||||
libffi-dev \
|
||||
libc-dev
|
||||
|
||||
# Add the patch fix
|
||||
COPY ./stack-fix.c /lib/
|
||||
@ -37,8 +44,7 @@ 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 && \
|
||||
apk add --no-cache --virtual .docker-compose-deps && \
|
||||
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.78",
|
||||
"version": "1.0.81",
|
||||
"lockfileVersion": 1
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ht-docker-dbase",
|
||||
"version": "1.0.78",
|
||||
"version": "1.0.81",
|
||||
"description": "easy CI for docker images",
|
||||
"main": "index.js",
|
||||
"directories": {
|
||||
|
Reference in New Issue
Block a user