diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index c4c249709d..1d4f88f68b 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -43,7 +43,7 @@ our @EXPORT_OK = qw( ); # might want to change this for upstream -use constant ENV_PREFIX => 'BMO_'; +use constant ENV_PREFIX => 'BZ_'; use constant PARAM_OVERRIDE => qw( use_mailer_queue mail_delivery_method shadowdb shadowdbhost shadowdbport shadowdbsock ); diff --git a/Dockerfile b/Dockerfile index 3b59196688..2f72bec0a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,6 +81,7 @@ WORKDIR /app COPY --from=builder /app/PACKAGES /app/PACKAGES RUN apt-get update -y && apt-get install -y $(cat PACKAGES) COPY --from=builder /app/local /app/local +COPY --from=builder /app/MYMETA.* /app/ COPY ./ /app/ env LOCALCONFIG_ENV 1 ENTRYPOINT ["perl", "bugzilla.pl"] diff --git a/Dockerfile.PL b/Dockerfile.PL index cdbc56f747..5a30d478ec 100755 --- a/Dockerfile.PL +++ b/Dockerfile.PL @@ -36,6 +36,7 @@ say $fh q{RUN apt-get update -y && apt-get install -y $(cat PACKAGES) }; # several lines should be merged together, and we need to make sure to clean up # the apt package cache after installing packages to maintain a small image size say $fh q{COPY --from=builder /app/local /app/local}; +say $fh q{COPY --from=builder /app/MYMETA.* /app/}; say $fh q{COPY ./ /app/}; say $fh q{env LOCALCONFIG_ENV 1};