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 e2e minio deployment #447

Merged
merged 3 commits into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions infrabox/test/e2e/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ _installPostgres() {

_installMinio() {
echo "## Install minio"
helm repo add stable https://charts.helm.sh/stable
helm install \
--set serviceType=ClusterIP,replicas=1,persistence.enabled=false \
-n infrabox-minio \
Expand Down
2 changes: 1 addition & 1 deletion src/api/handlers/account/account_ldap.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def post(self):
WHERE email = %s
''', [email])

if user and user['id'] == '00000000-0000-0000-0000-000000000000':
if user and user['password']:
# Admin login
if not bcrypt.checkpw(password.encode('utf8'), user['password'].encode('utf8')):
abort(400, 'Invalid email/password combination')
Expand Down
2 changes: 2 additions & 0 deletions src/images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ RUN apt-get update -y \
openssh-client \
inotify-tools \
&& pip install \
pyrsistent==0.15.7 \
six==1.14.0 \
psycopg2 \
flask \
flask-restx \
Expand Down
2 changes: 2 additions & 0 deletions src/images/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ RUN apt-get update -y \
curl \
git \
&& pip install \
pyrsistent==0.15.7 \
six==1.14.0 \
psycopg2 \
nose \
pyyaml \
Expand Down