Skip to content

Commit

Permalink
fix: build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alubbock committed Oct 15, 2023
1 parent eaa093b commit 33cd60b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN printf "def get_versions():\n return {'version': '$THUNORWEB_VERSION'}\n"
FROM thunorweb_base AS thunorweb_static_build

COPY _state/deploy-test/_state/webpack-bundles $THUNOR_HOME/_state/webpack-bundles
COPY _state/deploy-test/_state/thunor-static-build $THUNOR_HOME/_state/thunor-static
RUN DJANGO_DEBUG=False DJANGO_SECRET_KEY= DJANGO_EMAIL_HOST= DJANGO_EMAIL_PORT= DJANGO_EMAIL_USER= \
DJANGO_EMAIL_PASSWORD= POSTGRES_PASSWORD= python manage.py collectstatic --no-input

Expand Down
7 changes: 6 additions & 1 deletion thunorbld.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@


class ThunorBld(ThunorCmdHelper):
_DEFAULT_TAGS = 'alubbock/thunorweb:dev'

def __init__(self):
super(ThunorBld, self).__init__()
self.cwd = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -134,6 +136,9 @@ def _init_test_files(self):
def init_test(self):
""" Minimal init for unit testing/CI purposes """
self._init_test_files()
self.args.use_buildx = False
self.args.tags = self._DEFAULT_TAGS
self.push = False
self.thunorweb_build()

def run_tests(self):
Expand Down Expand Up @@ -250,7 +255,7 @@ def _parser(self):
help='Use docker buildx for cross-platform builds')
parser_build.add_argument('--push', action='store_true', default=False,
help='Push to repo after build')
parser_build.add_argument('--tags', default='alubbock/thunorweb:dev',
parser_build.add_argument('--tags', default=ThunorBld._DEFAULT_TAGS,
help='Tags to use when building container (comma separated)')
parser_build.set_defaults(func=self.thunorweb_build)

Expand Down

0 comments on commit 33cd60b

Please sign in to comment.