Skip to content

Commit cf9dcff

Browse files
committed
Merge branch 'hotfix/ci-builds'
2 parents 769b57b + 50ebef1 commit cf9dcff

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ branches:
1818
only:
1919
- master
2020
- develop
21+
- hotfix/ci-builds
2122
- /^v\d+\.\d+\.\d+(-S*)?$/
2223

2324
jobs:
@@ -37,7 +38,7 @@ jobs:
3738
script:
3839
- set -e
3940
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
40-
- .travis/bootstrap_image.sh -u driplineorg -r dripline-python -t v3.10.1 -a arm7 -i project8/dragonfly:`echo ${TRAVIS_BRANCH} | tr / _`
41+
- .travis/bootstrap_image.sh -u driplineorg -r dripline-python -t v3.10.1-arm -a arm7 -i project8/dragonfly:`echo ${TRAVIS_BRANCH} | tr / _`
4142
- stage: assemble manifest
4243
script:
4344
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

.travis/bootstrap_image.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ esac
9090
dot_travis_path=`dirname $0`
9191
dot_travis_path=`readlink -e $dot_travis_path`
9292

93-
set -x
93+
set -ex
9494

9595
# bootstrap a custom base image with emulation
9696
cp $original_qemu_path ${dot_travis_path}/this_qemu
@@ -112,4 +112,4 @@ docker build \
112112
.
113113
docker push ${output_image}-${architecture_img_suffix}
114114

115-
set +x
115+
set +ex

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ ARG img_tag=v3.10.1
88
FROM ${img_user}/${img_repo}:${img_tag}
99

1010
COPY . /dragonfly
11+
RUN apt-get install -y python3-psycopg2 libpq-dev
1112
RUN pip3 install /dragonfly[colorlog,database,slack]

0 commit comments

Comments
 (0)