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

Added nginx setup in docker-compose setup process #39

Merged
merged 3 commits into from
Apr 2, 2020
Merged

Added nginx setup in docker-compose setup process #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ad4e97
Added nginx setup in docker-compose setup process
Apr 2, 2020
addf660
Fixed a minor issue in for the cli container
Apr 2, 2020
ce2b61e
Merge branch 'master' into setup_with_docker_compose
nathangoulding Apr 2, 2020
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
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:
options:
tag: tink-cli
depends_on:
tinkerbell:
tink-server:
condition: service_healthy
db:
condition: service_healthy
Expand Down
20 changes: 20 additions & 0 deletions setup_with_docker_compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,26 @@ function setup_network () {
sudo ip addr add $NGINX_IP/$IP_CIDR dev $network_interface
}

function setup_osie_with_nginx() {
mkdir -p /packet/nginx/misc/osie/current
mkdir -p /packet/nginx/misc/tinkerbell/workflow/
cd /packet/nginx/misc/tinkerbell/workflow/
wget https://raw.githubusercontent.com/tinkerbell/osie/master/installer/workflow-helper.sh
wget https://raw.githubusercontent.com/tinkerbell/osie/master/installer/workflow-helper-rc
chmod +x workflow-helper.sh

cd /tmp
curl 'https://packet-osie-uploads.s3.amazonaws.com/osie-v19.10.23.00-n=55,c=be58d67,b=master.tar.gz' -o osie.tar.gz
tar -zxvf osie.tar.gz
cd /tmp/'osie-v19.10.23.00-n=55,c=be58d67,b=master'
cp -r grub /packet/nginx/misc/osie/current/
cp modloop-x86_64 /packet/nginx/misc/osie/current/
cp initramfs-x86_64 /packet/nginx/misc/osie/current/
cp vmlinuz-x86_64 /packet/nginx/misc/osie/current/
nathangoulding marked this conversation as resolved.
Show resolved Hide resolved
rm /tmp/'osie-v19.10.23.00-n=55,c=be58d67,b=master' -rf
}
function build_and_setup_certs () {
cd ~/go/src/github.com/tinkerbell/tink
grep "$HOST_IP" /etc/network/interfaces
if [[ $? -eq 1 ]]
then
Expand Down Expand Up @@ -89,6 +108,7 @@ function start_docker_stack() {

setup_environemt;
setup_network;
setup_osie_with_nginx;
build_and_setup_certs;
build_registry_and_update_worker_image;
start_docker_stack;