Skip to content

Commit 0e4f1b2

Browse files
authored
fix: skip all migrations on pg14 (#920)
1 parent 4180ad6 commit 0e4f1b2

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

internal/db/diff/migra.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ func likeEscapeSchema(schemas []string) (result []string) {
122122
func CreateShadowDatabase(ctx context.Context) (string, error) {
123123
config := container.Config{
124124
Image: utils.DbImage,
125-
Env: []string{"POSTGRES_PASSWORD=postgres"},
125+
Env: []string{
126+
"POSTGRES_PASSWORD=postgres",
127+
"POSTGRES_HOST=/var/run/postgresql",
128+
"POSTGRES_INITDB_ARGS=--lc-ctype=C.UTF-8",
129+
},
126130
}
127131
if utils.Config.Db.MajorVersion >= 14 {
128132
config.Cmd = []string{"postgres",
@@ -134,7 +138,7 @@ func CreateShadowDatabase(ctx context.Context) (string, error) {
134138
hostPort := strconv.FormatUint(uint64(utils.Config.Db.ShadowPort), 10)
135139
hostConfig := container.HostConfig{
136140
PortBindings: nat.PortMap{"5432/tcp": []nat.PortBinding{{HostPort: hostPort}}},
137-
Binds: []string{"/dev/null:/docker-entrypoint-initdb.d/migrate.sh:ro"},
141+
Tmpfs: map[string]string{"/docker-entrypoint-initdb.d": ""},
138142
AutoRemove: true,
139143
}
140144
return utils.DockerStart(ctx, config, hostConfig, "")

internal/db/start/start.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func StartDatabase(ctx context.Context, fsys afero.Fs, w io.Writer, options ...f
4545
Env: []string{
4646
"POSTGRES_PASSWORD=postgres",
4747
"POSTGRES_HOST=/var/run/postgresql",
48-
"LC_ALL=C.UTF-8",
48+
"POSTGRES_INITDB_ARGS=--lc-ctype=C.UTF-8",
4949
},
5050
Healthcheck: &container.HealthConfig{
5151
Test: []string{"CMD", "pg_isready", "-U", "postgres", "-h", "localhost", "-p", "5432"},
@@ -74,10 +74,8 @@ func StartDatabase(ctx context.Context, fsys afero.Fs, w io.Writer, options ...f
7474
hostConfig := container.HostConfig{
7575
PortBindings: nat.PortMap{"5432/tcp": []nat.PortBinding{{HostPort: hostPort}}},
7676
RestartPolicy: container.RestartPolicy{Name: "always"},
77-
Binds: []string{
78-
utils.DbId + ":/var/lib/postgresql/data",
79-
"/dev/null:/docker-entrypoint-initdb.d/migrate.sh:ro",
80-
},
77+
Binds: []string{utils.DbId + ":/var/lib/postgresql/data"},
78+
Tmpfs: map[string]string{"/docker-entrypoint-initdb.d": ""},
8179
}
8280
fmt.Fprintln(w, "Starting database...")
8381
// Creating volume will not override existing volume, so we must inspect explicitly

0 commit comments

Comments
 (0)