Bladeren bron

Merge branch 'master' of ssh://git.sdsys.ru:8022/sdsys/ansible-image

Vadim Surkov 3 jaren geleden
bovenliggende
commit
08799a10f4
2 gewijzigde bestanden met toevoegingen van 13 en 2 verwijderingen
  1. 2 2
      Dockerfile
  2. 11 0
      Dockerfile.alpine

+ 2 - 2
Dockerfile

@@ -1,4 +1,4 @@
-# syntax = tonistiigi/dockerfile:runmount20180618
+# syntax=docker/dockerfile:1.0-experimental
 
 FROM centos:7.7.1908
 LABEL maintainer="surkov.v@sdsys.ru"
@@ -9,4 +9,4 @@ RUN --mount=type=bind,source=./files,target=/tmp/files \
     && pip install -r /tmp/files/requirements.txt \
     && adduser ansible
 
-USER ansible
+USER ansible

+ 11 - 0
Dockerfile.alpine

@@ -0,0 +1,11 @@
+# syntax=docker/dockerfile:1.0-experimental
+
+FROM alpine
+LABEL maintainer="surkov.v@sdsys.ru"
+
+RUN --mount=type=bind,source=./files,target=/tmp/files \
+    apk --no-cache add libffi-dev build-base py2-pip python2-dev libressl-dev\
+    && pip install -r /tmp/files/requirements.txt \
+    && adduser -D ansible
+
+USER ansible