Skip to content

Commit 562cd42

Browse files
committed
Change for ubuntu core-base-consul version
0 parents  commit 562cd42

40 files changed

+1505
-0
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
rootfs/etc/consul-template/conf-services.d/.gitkeep
2+
rootfs/etc/cont-consul/services.d/.gitkeep
3+
rootfs/etc/cont-consul/checks.d/.gitkeep

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.idea
2+
.env

.travis.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
language: bash
2+
3+
dist: trusty
4+
5+
sudo: required
6+
7+
services:
8+
- docker
9+
10+
env:
11+
global:
12+
- COMMIT=${TRAVIS_COMMIT::8}
13+
- REPO=dockerframework/core-base-consul:ubuntu
14+
- CGO_ENABLED=0
15+
- GOOS=linux
16+
- GOARCH=amd64
17+
18+
before_install:
19+
- sudo chmod +x ./tests/docker_tests.sh
20+
- sudo chmod +x ./tests/docker_run.sh
21+
- sudo apt-get update
22+
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
23+
- echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
24+
- sudo service docker restart
25+
- sleep 3
26+
27+
script:
28+
- ./tests/docker_tests.sh
29+
- ./tests/docker_run.sh

Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM dockerframework/core-base:ubuntu
2+
3+
# ================================================================================================
4+
# Inspiration: Docker Alpine (https://github.com/bhuisgen/docker-alpine)
5+
# Boris HUISGEN <[email protected]>
6+
# ================================================================================================
7+
# Core Contributors:
8+
# - Mahmoud Zalt @mahmoudz
9+
# - Bo-Yi Wu @appleboy
10+
# - Philippe Trépanier @philtrep
11+
# - Mike Erickson @mikeerickson
12+
# - Dwi Fahni Denni @zeroc0d3
13+
# - Thor Erik @thorerik
14+
# - Winfried van Loon @winfried-van-loon
15+
# - TJ Miller @sixlive
16+
# - Yu-Lung Shao (Allen) @bestlong
17+
# - Milan Urukalo @urukalo
18+
# - Vince Chu @vwchu
19+
# - Huadong Zuo @zuohuadong
20+
# ================================================================================================
21+
22+
MAINTAINER "Laradock Team <[email protected]>"
23+
24+
ENV CONSULTEMPLATE_VERSION=0.19.5
25+
26+
RUN mkdir -p /var/lib/consul && \
27+
addgroup -g 500 -S consul && \
28+
adduser -u 500 -S -D -g "" -G consul -s /sbin/nologin -h /var/lib/consul consul && \
29+
chown -R consul:consul /var/lib/consul
30+
31+
RUN curl -sSL https://releases.hashicorp.com/consul-template/${CONSULTEMPLATE_VERSION}/consul-template_${CONSULTEMPLATE_VERSION}_linux_amd64.zip -o /tmp/consul-template.zip && \
32+
unzip /tmp/consul-template.zip -d /bin && \
33+
rm -f /tmp/consul-template.zip && \
34+
apt-get clean && \
35+
rm -rf /var/cache/apk/*
36+
37+
COPY rootfs/ /
38+
39+
HEALTHCHECK CMD /etc/cont-consul/check || exit 1

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 Docker Framework
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

Makefile.am

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
IMAGE = dockerframework/core-base-consul:ubuntu
2+
3+
clean-local:
4+
docker rmi $(CLEAN_OPTIONS) $(IMAGE):$(TAG) || true
5+
6+
build:
7+
docker build $(BUILD_OPTIONS) -t $(IMAGE):$(TAG) .
8+
9+
pull:
10+
docker pull $(PULL_OPTIONS) $(IMAGE):$(TAG)
11+
12+
push: build
13+
docker push $(PUSH_OPTIONS) $(IMAGE):$(TAG)

0 commit comments

Comments
 (0)