Skip to content

Commit

Permalink
Adds build for armv6. Prepares v0.0.4. Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tlex committed Jan 26, 2020
1 parent d19c057 commit dfb8269
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
variables:
DOCKER_DRIVER: overlay2
DOCKERHUB_REPO_PREFIX: ixdotai
DOCKERHUB_REPO_NAME: csp
ENABLE_ARM64: 'true'
ENABLE_ARMv7: 'true'
ENABLE_ARMv6: 'true'

include:
- project: 'ix.ai/ci-templates'
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:latest

LABEL maintainer='ix.ai <docker@ix.ai>'
LABEL maintainer="docker@ix.ai" \
ai.ix.repository="ix.ai/csp"

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ services:

## Tags and Arch

Starting with version v0.0.3, the images are multi-arch, with builds for amd64, arm64 and armv7.
Starting with version v0.0.4, the images are multi-arch, with builds for amd64, arm64, armv7 and armv6.
* `vN.N.N` - for example v0.0.3
* `latest` - always pointing to the latest version
* `dev-branch` - the last build on a feature/development branch
Expand Down
6 changes: 4 additions & 2 deletions src/csp.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
datefmt='%Y-%m-%d %H:%M:%S'
)

FILENAME = os.path.splitext(sys.modules['__main__'].__file__)[0]

APP = Flask(__name__)
APP.secret_key = os.urandom(64).hex()

Expand All @@ -40,7 +42,7 @@ def configure_logging():
port=SETTINGS['gelf_port'],
debug=True,
include_extra_fields=True,
_ix_id=os.path.splitext(sys.modules['__main__'].__file__)[0][1:],
_ix_id=FILENAME,
)
LOG.addHandler(GELF)
gelf_enabled = True
Expand All @@ -65,7 +67,7 @@ def log_csp():
if __name__ == '__main__':
configure_logging()
LOG.info("Starting {} {}, listening on {}:{}".format(
os.path.splitext(sys.modules['__main__'].__file__)[0][1:],
FILENAME,
# pylint: disable=no-member
constants.VERSION,
SETTINGS['address'],
Expand Down
2 changes: 1 addition & 1 deletion src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
waitress==1.4.2
flask==1.1.1
prometheus_client==0.7.1
pygelf
pygelf==0.3.6

0 comments on commit dfb8269

Please sign in to comment.