Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue#3 build for latest os #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
OUTDIR = ./build

.PHONY: centos7 centos6 alpine37 debian9 ubuntu14 ubuntu16 clean all list
.PHONY: centos7 centos6 alpine37 alpine310 debian9 debian10 ubuntu14 ubuntu16 clean all list

all: alpine37 centos7 centos6 debian9 ubuntu14 ubuntu16
all: alpine37 alpine310 centos7 centos6 debian9 debian10 ubuntu14 ubuntu16

list:
@$(MAKE) -rpn | sed -n -e '/^$$/ { n ; /^[^ .#][^ ]*:/ { s/:.*$$// ; p ; } ; }' | sort

alpine37 centos6 centos7 debian9 ubuntu14 ubuntu16:
alpine37 alpine310 centos6 centos7 debian9 debian10 ubuntu14 ubuntu16:
@if [ ! -d $(OUTDIR) ]; then mkdir -p $(OUTDIR); fi
@echo "Symlinking $@ Dockerfile.."
@ln -s $@/Dockerfile ./Dockerfile
Expand Down
13 changes: 13 additions & 0 deletions alpine310/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM alpine:3.10.3
COPY ./ccr/requirements.txt /tmp/requirements.txt
COPY ./ccr/* /tmp/
ENV PATH="${PATH}:/ccr"
RUN apk update && \
/sbin/apk add python3 && \
/bin/mkdir -p /ccr/ccr.d && \
/usr/bin/python3 -m venv /ccr/ccr.d && \
/ccr/ccr.d/bin/pip install -r /tmp/requirements.txt && \
/bin/mv /tmp/ccr.py /ccr/ccr && \
/bin/chmod +x /ccr/ccr && \
/bin/rm -rf /tmp/* && \
/bin/rm -rf /var/cache/apk/*
4 changes: 2 additions & 2 deletions ccr/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
hvac==0.3.0
requests==2.18.4
Jinja2==2.10
requests==2.20.0
Jinja2==2.10.1
13 changes: 13 additions & 0 deletions debian10/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM debian:buster
COPY ./ccr/requirements.txt /tmp/requirements.txt
COPY ./ccr/ccr.py /tmp
ENV PATH="${PATH}:/ccr"
RUN /usr/bin/apt-get update && \
/usr/bin/apt-get install -y python3-minimal python3-venv && \
/bin/mkdir -p /ccr/ccr.d && \
/usr/bin/python3 -m venv /ccr/ccr.d && \
/ccr/ccr.d/bin/pip3 install -r /tmp/requirements.txt && \
/bin/mv /tmp/ccr.py /ccr/ccr && \
/bin/chmod +x /ccr/ccr && \
/bin/rm -f /tmp/requirements.txt && \
/usr/bin/apt-get clean