Skip to content

Support scripts changes #34

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

Closed
wants to merge 6 commits into from
Closed

Support scripts changes #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
466192f
Updated Ubuntu 21.04 to 22.04, python2 to python3
Denperidge Jan 3, 2023
58a1095
Updated support-scripts edi_docker_host_option
Denperidge Jan 3, 2023
77d9eda
Undo bin changes for PR #34
Denperidge Apr 14, 2023
1a6cb5e
Updated support-scripts edi_docker_host_option
Denperidge Jan 3, 2023
2cc22b5
Undo bin changes for PR #34
Denperidge Apr 14, 2023
c2bc238
Merge branch 'support-scripts-changes' of https://github.com/Denperid…
Denperidge Apr 14, 2023
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:21.04
FROM ubuntu:22.04
LABEL maintainer="Aad Versteden <[email protected]>"

# Install nodejs as per http://askubuntu.com/questions/672994/how-to-install-nodejs-4-on-ubuntu-15-04-64-bit-edition
RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update; apt-get -y install wget python build-essential git libfontconfig curl rsync
RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update; apt-get -y install wget python3 build-essential git libfontconfig curl rsync
RUN wget -qO- https://deb.nodesource.com/setup_16.x > node_setup.sh
RUN bash node_setup.sh
RUN apt-get -y install nodejs
Expand Down
16 changes: 12 additions & 4 deletions support-scripts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,25 @@ edi_does_container_exist() {
}

edi_docker_host_option() {
if [[ "$OSTYPE" == "linux-gnu" || "$OSTYPE" == "linux" ]]
if [[ "$OSTYPE" == "linux"* ]]
then
# Linux
DOCKERHOST=`ip addr show docker0 | grep inet | head -n 1 | awk '{ print $2 }' | grep -oP "^[^/]+"`
elif [[ "$OSTYPE" == "darwin"* ]]; then
# Mac OSX
# Solution found via https://stackoverflow.com/questions/24319662/from-inside-of-a-docker-container-how-do-i-connect-to-the-localhost-of-the-mach
DOCKERHOST=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)
else
echo "OS TYPE $OSTYPE not understood"
exit 1
fi

if [ -z "$DOCKERHOST" ]
then
# Normally echos would be used to not have all the info on one line in read -p,
# but considering that echo is used to build the command, that is not possible here.
default="172.17.0.1"
read -p $'Docker host could not be determined
Please manually enter the IP of your docker0 bridge connection
docker0 ip '"[$default]: " DOCKERHOST
DOCKERHOST=${DOCKERHOST:-$default}
fi
echo "--add-host host:$DOCKERHOST "
}
Expand Down
4 changes: 2 additions & 2 deletions templates/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:21.04
FROM ubuntu:22.04
LABEL maintainer="Aad Versteden <[email protected]>"

# Install nodejs as per http://askubuntu.com/questions/672994/how-to-install-nodejs-4-on-ubuntu-15-04-64-bit-edition
RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update; apt-get -y install wget python build-essential git libfontconfig curl rsync
RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update; apt-get -y install wget python3 build-essential git libfontconfig curl rsync
RUN wget -qO- https://deb.nodesource.com/setup_16.x > node_setup.sh
RUN bash node_setup.sh
RUN apt-get -y install nodejs
Expand Down