Skip to content

Commit 57213ab

Browse files
yosifkityosifkit
authored
Merge pull request #355 from infosiftr/cyrillic
Fix PATH, especially for cyrillic characters in psql
2 parents b7cb3c6 + f7dc572 commit 57213ab

12 files changed

+6
-12
lines changed

‎10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ RUN mv -v "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample" /usr/share/po
120120

121121
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
122122

123-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
123+
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
124124
ENV PGDATA /var/lib/postgresql/data
125125
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
126126
VOLUME /var/lib/postgresql/data

‎10/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/pos
138138

139139
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
140140

141-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
142141
ENV PGDATA /var/lib/postgresql/data
143142
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
144143
VOLUME /var/lib/postgresql/data

‎9.3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN mv -v "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample" /usr/share/po
121121

122122
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
123123

124-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
124+
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
125125
ENV PGDATA /var/lib/postgresql/data
126126
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
127127
VOLUME /var/lib/postgresql/data

‎9.3/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/pos
165165

166166
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
167167

168-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
169168
ENV PGDATA /var/lib/postgresql/data
170169
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
171170
VOLUME /var/lib/postgresql/data

‎9.4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN mv -v "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample" /usr/share/po
121121

122122
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
123123

124-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
124+
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
125125
ENV PGDATA /var/lib/postgresql/data
126126
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
127127
VOLUME /var/lib/postgresql/data

‎9.4/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/pos
138138

139139
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
140140

141-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
142141
ENV PGDATA /var/lib/postgresql/data
143142
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
144143
VOLUME /var/lib/postgresql/data

‎9.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN mv -v "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample" /usr/share/po
121121

122122
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
123123

124-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
124+
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
125125
ENV PGDATA /var/lib/postgresql/data
126126
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
127127
VOLUME /var/lib/postgresql/data

‎9.5/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/pos
138138

139139
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
140140

141-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
142141
ENV PGDATA /var/lib/postgresql/data
143142
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
144143
VOLUME /var/lib/postgresql/data

‎9.6/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN mv -v "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample" /usr/share/po
121121

122122
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
123123

124-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
124+
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
125125
ENV PGDATA /var/lib/postgresql/data
126126
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
127127
VOLUME /var/lib/postgresql/data

‎9.6/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/pos
138138

139139
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
140140

141-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
142141
ENV PGDATA /var/lib/postgresql/data
143142
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
144143
VOLUME /var/lib/postgresql/data

‎Dockerfile-alpine.template

-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/pos
140140

141141
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
142142

143-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
144143
ENV PGDATA /var/lib/postgresql/data
145144
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
146145
VOLUME /var/lib/postgresql/data

‎Dockerfile-debian.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN mv -v "/usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample" /usr/share/po
121121

122122
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
123123

124-
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
124+
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
125125
ENV PGDATA /var/lib/postgresql/data
126126
RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
127127
VOLUME /var/lib/postgresql/data

0 commit comments

Comments
 (0)