Compare commits
2 Commits
e173888692
...
6f9933f332
| Author | SHA1 | Date | |
|---|---|---|---|
| 6f9933f332 | |||
| 3936d1c651 |
@@ -23,4 +23,4 @@ RUN chmod +x entrypoint.sh
|
||||
|
||||
COPY --from=builder /source/build /usr/share/nginx/html
|
||||
|
||||
ENTRYPOINT ["./entrypoint.sh"]
|
||||
ENTRYPOINT ["./entrypoint.s"]
|
||||
@@ -3,38 +3,6 @@
|
||||
|
||||
set -e
|
||||
|
||||
if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
|
||||
exec 3>&1
|
||||
else
|
||||
exec 3>/dev/null
|
||||
fi
|
||||
|
||||
if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
|
||||
if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then
|
||||
echo >&3 "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration"
|
||||
|
||||
echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
|
||||
find "/docker-entrypoint.d/" -follow -type f -print | sort -n | while read -r f; do
|
||||
case "$f" in
|
||||
*.sh)
|
||||
if [ -x "$f" ]; then
|
||||
echo >&3 "$0: Launching $f";
|
||||
"$f"
|
||||
else
|
||||
# warn on shell scripts without exec bit
|
||||
echo >&3 "$0: Ignoring $f, not executable";
|
||||
fi
|
||||
;;
|
||||
*) echo >&3 "$0: Ignoring $f";;
|
||||
esac
|
||||
done
|
||||
|
||||
echo >&3 "$0: Configuration complete; ready for start up"
|
||||
else
|
||||
echo >&3 "$0: No files found in /docker-entrypoint.d/, skipping configuration"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Set up endpoint for env retrieval
|
||||
echo "window._env_ = {" > /usr/share/nginx/html/env_config.js
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@ import getConfig from "../config/config";
|
||||
const config = getConfig();
|
||||
|
||||
const keycloak = new Keycloak({
|
||||
url: config.REACT_APP_KC_HOSTNAME || process.env.REACT_APP_KC_HOSTNAME,
|
||||
url: config.REACT_APP_KC || process.env.REACT_APP_KC,
|
||||
realm: "Jodel",
|
||||
clientId: "jodel-frontend",
|
||||
});
|
||||
|
||||
keycloak.init({ onLoad: 'login-required' }).then((authenticated) => {});
|
||||
//keycloak.init({ onLoad: 'login-required' }).then((authenticated) => {});
|
||||
|
||||
export default keycloak;
|
||||
@@ -4,7 +4,7 @@ import keycloak from "../Authentification/Keycloak";
|
||||
import getConfig from "../config/config";
|
||||
|
||||
const config = getConfig();
|
||||
const path = config.REACT_APP_API_HOSTNAME || process.env.REACT_APP_API_HOSTNAME;
|
||||
const path = config.REACT_APP_API || process.env.REACT_APP_API;
|
||||
|
||||
export const postApi = {
|
||||
async getPostsByCoords (lat, lon) {
|
||||
|
||||
Reference in New Issue
Block a user