diff --git a/docker-compose.yml b/docker-compose.yml index 18e537e..40af60d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,9 +42,9 @@ services: restart: unless-stopped lemur: - image: netlix-lemur:latest - build: - context: ./lemur-build-docker + image: jockerdragon/netlix-lemur:latest + #build: + # context: ./lemur-build-docker #name: lemur restart: on-failure networks: diff --git a/lemur-build-docker/Dockerfile b/lemur-build-docker/Dockerfile index 51d64f0..8219b35 100644 --- a/lemur-build-docker/Dockerfile +++ b/lemur-build-docker/Dockerfile @@ -11,11 +11,11 @@ COPY lemur/ /opt/lemur WORKDIR /opt/lemur RUN apt-get update && \ - apt-get -y --no-install-recommends upgrade && \ + #apt-get -y --no-install-recommends upgrade && \ apt-get install -y --no-install-recommends libpq-dev curl build-essential locales libffi-dev libsasl2-dev libldap2-dev \ dh-autoreconf git python3-dev python3-pip python3-venv python3-wheel nodejs npm && \ locale-gen en_US.UTF-8 && export LC_ALL=en_US.UTF-8 && \ - npm config set registry http://registry.npmjs.org/ && \ + npm config set registry https://registry.npmjs.org/ && \ npm install npm -g && \ echo "Running with nodejs:" && node -v && \ python3 -m venv /opt/venv && \ @@ -77,4 +77,4 @@ USER root ENTRYPOINT ["/entrypoint"] -CMD ["/usr/bin/supervisord","-c","/supervisor.conf"] \ No newline at end of file +CMD ["/usr/bin/supervisord","-c","/supervisor.conf"] diff --git a/setup_cfssl.sh b/setup_cfssl.sh index 8e3c5dc..72095fc 100755 --- a/setup_cfssl.sh +++ b/setup_cfssl.sh @@ -10,8 +10,8 @@ then add-apt-repository ppa:longsleep/golang-backports apt update apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6BC817356A3D45E - apt update && apt upgrade - apt install golang-go + apt update #&& apt upgrade + apt install golang-1.16-go #setup password from password config file source ./creds.env @@ -102,7 +102,7 @@ else echo "Read the readme, and configure everything!" sleep 2 - nano ./creds.env + vim ./creds.env fi exit 1