diff --git a/CHANGELOG.MD b/CHANGELOG.MD index e11b0906f..da9441b26 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.3.0-rc6] - 2024-07-29 + +### Changed + +- Fixed a Docker copy with postgres based on https://github.com/its-a-feature/Mythic/issues/393 when use_volume is true + ## [3.3.0-rc5] - 2024-07-29 ### Changed diff --git a/VERSION b/VERSION index 27a90ae2a..397ba33f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-rc5 \ No newline at end of file +3.3.0-rc6 \ No newline at end of file diff --git a/mythic-docker/src/VERSION b/mythic-docker/src/VERSION index 27a90ae2a..397ba33f0 100644 --- a/mythic-docker/src/VERSION +++ b/mythic-docker/src/VERSION @@ -1 +1 @@ -3.3.0-rc5 \ No newline at end of file +3.3.0-rc6 \ No newline at end of file diff --git a/postgres-docker/.docker/Dockerfile b/postgres-docker/.docker/Dockerfile index b3f4c96bf..c01c55bcd 100644 --- a/postgres-docker/.docker/Dockerfile +++ b/postgres-docker/.docker/Dockerfile @@ -1,7 +1,7 @@ FROM postgres:15-alpine COPY ["pg_hba.conf", "/var/lib/postgresql/pg_hba.conf"] COPY ["configuration.sh", "/docker-entrypoint-initdb.d/configuration.sh"] -COPY ["postgres.conf", "/etc/postgres.conf"] +COPY ["postgres.conf", "/etc/postgresql.conf"] HEALTHCHECK --interval=30s --timeout=30s --retries=5 --start-period=20s \ CMD pg_isready -d mythic_db -U mythic_user || exit 1 \ No newline at end of file diff --git a/postgres-docker/Dockerfile b/postgres-docker/Dockerfile index b3f4c96bf..c01c55bcd 100755 --- a/postgres-docker/Dockerfile +++ b/postgres-docker/Dockerfile @@ -1,7 +1,7 @@ FROM postgres:15-alpine COPY ["pg_hba.conf", "/var/lib/postgresql/pg_hba.conf"] COPY ["configuration.sh", "/docker-entrypoint-initdb.d/configuration.sh"] -COPY ["postgres.conf", "/etc/postgres.conf"] +COPY ["postgres.conf", "/etc/postgresql.conf"] HEALTHCHECK --interval=30s --timeout=30s --retries=5 --start-period=20s \ CMD pg_isready -d mythic_db -U mythic_user || exit 1 \ No newline at end of file