Skip to content

Commit

Permalink
Merge pull request #579 from kids-first/ash-to-bash
Browse files Browse the repository at this point in the history
🐛 Fix bugs from switching to Debian image
  • Loading branch information
znatty22 authored Feb 18, 2021
2 parents fa5896a + 874ff6b commit 40cf58c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV PYTHONUNBUFFERED 1
WORKDIR /app
COPY requirements.txt /app/
RUN apt-get update && \
apt-get install -y --no-install-recommends git
apt-get install -y --no-install-recommends git postgresql-client
RUN pip install awscli && \
pip install --no-cache-dir -r requirements.txt

Expand Down
2 changes: 1 addition & 1 deletion JenkinsfileWorker
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ecs_service_existing_alb {
orgFullName = "kids-first"
environments = "dev,qa,prd"
build_environments = "dev,qa,prd"
docker_image_type = "alpine"
docker_image_type = "debian"
create_default_iam_role = "1"
entrypoint_command = "/app/bin/entrypoint.sh"
quick_deploy = "true"
Expand Down
2 changes: 1 addition & 1 deletion bin/dev_entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/ash
#!/bin/bash
#!/bin/sh
# wait-for-postgres.sh

Expand Down
2 changes: 1 addition & 1 deletion bin/dev_worker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ash
#!/usr/bin/env bash
# This runs the worker on periodic burst mode so that changes made to tasks
# during development will be applied when the worker executes them
while true; do
Expand Down
1 change: 1 addition & 0 deletions bin/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
set -e
set +x
if [[ "$WORKER" == "true" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/scheduler.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
[program:rqscheduler]
process_name=%(program_name)s_%(process_num)02d
numprocs=1
command=ash -c 'sleep 60 && /app/manage.py rqscheduler'
command=bash -c 'sleep 60 && /app/manage.py rqscheduler'
autostart=true
autorestart=true
stderr_logfile=/dev/stdout
Expand Down

0 comments on commit 40cf58c

Please sign in to comment.