Skip to content

Commit 692ea46

Browse files
committed
Remove Dockerfile and build triggers
1 parent 0f77274 commit 692ea46

File tree

3 files changed

+5
-96
lines changed

3 files changed

+5
-96
lines changed

.circleci/config.yml

-66
Original file line numberDiff line numberDiff line change
@@ -77,55 +77,6 @@ jobs:
7777
when: always
7878
command: python setup.py checkdocs
7979

80-
build-docker:
81-
docker:
82-
- image: docker:stable
83-
parameters:
84-
rebuild:
85-
type: boolean
86-
default: false
87-
environment:
88-
- SUPPORTED_TAGS: ^v[5-9][0-9]*\.[0-9]+\.[0-9]+$
89-
steps:
90-
- run:
91-
name: Install git
92-
command: apk add bash git openssh
93-
- checkout
94-
- setup_remote_docker
95-
- run:
96-
name: Determine tag name
97-
command: |
98-
tags="${CIRCLE_BRANCH}"
99-
if [ -n "${CIRCLE_TAG}" ]; then
100-
minortag=$(echo ${CIRCLE_TAG} | sed 's/^\(v[0-9]*\.[0-9]*\)\..*$/\1/')
101-
majortag=$(echo ${CIRCLE_TAG} | sed 's/^\(v[0-9]*\)\..*$/\1/')
102-
tags="${CIRCLE_TAG:1} ${minortag:1} ${majortag:1}"
103-
fi
104-
echo "Mapping to tags: ${tags}"
105-
echo "export TAGS=\"${tags}\"" >> ${BASH_ENV}
106-
- run:
107-
name: Build Docker image
108-
command: |
109-
source ${BASH_ENV}
110-
docker build --no-cache -t saltyrtc-server-python .
111-
for tag in ${TAGS}; do
112-
docker tag saltyrtc-server-python saltyrtc/saltyrtc-server-python:${tag}
113-
done
114-
- run:
115-
name: Push Docker image
116-
command: |
117-
source ${BASH_ENV}
118-
docker login -u ${DOCKER_USER} -p ${DOCKER_API_KEY}
119-
for tag in ${TAGS}; do
120-
docker push saltyrtc/saltyrtc-server-python:${tag}
121-
done
122-
- when:
123-
condition: << parameters.rebuild >>
124-
steps:
125-
- run:
126-
name: Build and push Docker images for supported tags
127-
command: .circleci/build-docker.sh
128-
12980

13081
workflows:
13182
version: 2
@@ -135,20 +86,3 @@ workflows:
13586
- test-python-3_7-asyncio
13687
- test-python-3_7-uvloop
13788
- test-python-3_6-asyncio
138-
docker:
139-
jobs:
140-
- build-docker:
141-
filters:
142-
tags:
143-
only: /^v.*/
144-
docker-weekly:
145-
triggers:
146-
- schedule:
147-
cron: "0 5 * * 1"
148-
filters:
149-
branches:
150-
only: master
151-
jobs:
152-
- build-docker:
153-
rebuild: true
154-

Dockerfile

-28
This file was deleted.

RELEASING.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,14 @@ Signing key: https://lgrahl.de/pub/pgp-key.txt
5757

5858
8. Create a new release on GitHub.
5959

60-
9. Prepare CHANGELOG.rst for upcoming changes:
60+
9. Push a Docker file to the ``ci/docker-builds`` branch (and remove
61+
old images, if desired).
62+
63+
10. Prepare CHANGELOG.rst for upcoming changes:
6164

6265
```rst
6366
`Unreleased`_ (YYYY-MM-DD)
6467
--------------------------
6568
```
6669

67-
10. Pat yourself on the back and celebrate!
70+
11. Pat yourself on the back and celebrate!

0 commit comments

Comments
 (0)