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.

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

fix some bug #11

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions lemur-build-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down Expand Up @@ -77,4 +77,4 @@ USER root

ENTRYPOINT ["/entrypoint"]

CMD ["/usr/bin/supervisord","-c","/supervisor.conf"]
CMD ["/usr/bin/supervisord","-c","/supervisor.conf"]
6 changes: 3 additions & 3 deletions setup_cfssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -102,7 +102,7 @@ else
echo "Read the readme, and configure everything!"
sleep 2

nano ./creds.env
vim ./creds.env
fi

exit 1