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.

Sign up for GitHub

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

Jump to bottom

Ubuntu16.04 #8

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ubuntu16.04 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a489187
updated Dockerfile to succesfully build image with newer version of s…
May 29, 2018
23923c2
Updated Dockerfile to use Xenial, and Salt version 2018.3.0
Count042 May 29, 2018
8acea83
Fixed issue with starting and added virt-what
Count042 May 29, 2018
783ae29
Updated Refreshed_at
Count042 May 30, 2018
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
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM ubuntu:14.04
FROM ubuntu:16.04
MAINTAINER Love Nyberg "[email protected]"
ENV REFRESHED_AT 2015-04-03
ENV REFRESHED_AT 2018-05-29

# Update system
RUN apt-get update && \
apt-get install -y wget curl dnsutils python-pip python-dev python-apt software-properties-common dmidecode
apt-get install -y wget curl dnsutils python-pip python-dev python-apt software-properties-common dmidecode virt-what

# Setup salt ppa
RUN echo deb http://ppa.launchpad.net/saltstack/salt/ubuntu `lsb_release -sc` main | tee /etc/apt/sources.list.d/saltstack.list && \
wget -q -O- "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4759FA960E27C0A6" | apt-key add -
RUN echo deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main | tee /etc/apt/sources.list.d/saltstack.list && \
wget -q -O- "https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub" | apt-key add -

# Install salt master/minion/cloud/api
ENV SALT_VERSION 2014.7.2+ds-1trusty2
ENV SALT_VERSION 2018.3.0+ds-1
RUN apt-get update && \
apt-get install -y salt-master=$SALT_VERSION salt-minion=$SALT_VERSION \
salt-cloud=$SALT_VERSION salt-api=$SALT_VERSION
Expand Down
4 changes: 2 additions & 2 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ echo $SALT_NAME > /etc/salt/minion_id
# If salt master also start minion in background
if [ $SALT_USE == "master" ]; then
echo "INFO: Starting salt-minion and auto connect to salt-master"
sudo service salt-minion start
service salt-minion start
fi

# Set salt grains
Expand All @@ -23,4 +23,4 @@ fi

# Start salt-$SALT_USE
echo "INFO: Starting salt-$SALT_USE with log level $LOG_LEVEL with hostname $SALT_NAME"
sudo /usr/bin/salt-$SALT_USE --log-level=$LOG_LEVEL $OPTIONS
/usr/bin/salt-$SALT_USE --log-level=$LOG_LEVEL $OPTIONS