Skip to content
This repository has been archived by the owner on Dec 3, 2021. It is now read-only.

Updates to utility image #285

Merged
merged 3 commits into from
Jan 25, 2020
Merged

Updates to utility image #285

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
4bf3973
Remove utility motd
Mierdin Jan 15, 2020
1c6ae8f
Removed jsnapy stanza from Dockerfile and updated motd with colors
Mierdin Jan 21, 2020
52d295a
Add JSNAPy fix back in, upstream still not ready
Mierdin Jan 25, 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
11 changes: 8 additions & 3 deletions images/utility/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y openssh-server python python-pip dnsutils iputils-ping git vim curl util-linux sshpass nano jq
RUN mkdir /var/run/sshd
Expand Down Expand Up @@ -32,10 +32,15 @@ RUN echo "export VISIBLE=now" >> /etc/profile
ADD requirements.txt /requirements.txt
RUN pip install -r /requirements.txt

# Temporary measure to get the latest yaml fix
# The latest release of JSNAPy as of now was 1.3.2, released in
# May of 2018. Since then, there have been many fixes, and the main one we care
# about is the YAML deprecation notices. I will follow up with them and ask why
# we haven't done a release in so long with many outstanding fixes already in
# master, but in the meantime, we will clone and check out a commit manually so
# we can avoid the YAML deprecation notices
RUN git clone https://github.com/Juniper/jsnapy.git /tmp/jsnapy \
&& cd /tmp/jsnapy \
&& git checkout dd0dbb12e47ec5183e9e2ac9cd99195c861c925e \
&& git checkout bb8e02b1a9bd0e981c7d9a18cd1a08f5596cac65 \
&& python setup.py install

EXPOSE 22
Expand Down
14 changes: 3 additions & 11 deletions images/utility/motd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
#!/bin/sh
#!/bin/bash

printf "\n"
printf " ###############################################################\n"
printf " # WELCOME TO ANTIDOTE #\n"
printf " # #\n"
printf " # This is the 'utility' container. This is used to run Python #\n"
printf " # scripts, workflows, tools, commands, etc - anything needed #\n"
printf " # to perform automation tasks on our network devices. #\n"
printf " # #\n"
printf " # Documentation: https://antidoteproject.readthedocs.io #\n"
printf " ###############################################################\n"
printf "Welcome to \u001b[1;38;5;36mNRE Labs\033[1m%s\033[0m! \n"
printf " * Docs - https://docs.nrelabs.io/\n"