Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow nginx configuration extension through /etc/nginx/conf.d/*.conf #285

Merged
merged 3 commits into from
Nov 22, 2023

Conversation

jvies
Copy link
Contributor

@jvies jvies commented Sep 28, 2022

No description provided.

This was referenced Sep 28, 2022
@jvies
Copy link
Contributor Author

jvies commented Sep 28, 2022

OK... I think I pushed too quickly :)

I'll do some other tests

@jvies jvies force-pushed the expand_nginx_conf branch 2 times, most recently from 3b0acfe to 17dcc05 Compare September 28, 2022 08:19
@jvies
Copy link
Contributor Author

jvies commented Sep 28, 2022

My local test runs fine. As far as I understand, the test that fails checks a button with "Sign in" is present. On my local deployment, this button does not exist, as the page displayed is the installer wizard.
Any idea why my local deployment is different on from on the test deployment ?

@mriedmann
Copy link
Owner

In theory the test step should start the auto-installer. Maybe you haven't called that locally? Also it could be that it is simply broken.

@jvies jvies force-pushed the expand_nginx_conf branch 2 times, most recently from 210aa7f to c3e6886 Compare September 29, 2022 09:54
@jvies
Copy link
Contributor Author

jvies commented Sep 30, 2022

I built the docker image locally (using docker build . --tag humhub:master --build-arg HUMHUB_VERSION=1.11.4
It starts, but I can't find any button with "Sign in".
The only available buttons are:

            <!-- Footer -->
                            <div class="modal-footer">
                    <button data-modal-cancel data-modal-close class="btn btn-default"></button><button data-modal-confirm data-modal-close class="btn btn-primary"></button>                </div>
                        </div>
</div>   

This happens on master, as on my own branch. Any idea why ?

@mriedmann
Copy link
Owner

closed/reopened to run the checks again => There is no apparent reason this is failing. I am a bit puzzled tbh.

@mriedmann
Copy link
Owner

ok, this makes more sense now ... we most likely have to clear out the /etc/nginx/conf.d directory in the nginx base-image. Currently, we are ignoring those files but with your change this will mess up our config.

@jvies Can you try to add a "RUN rm -rf /etc/nginx/conf.d" before the copy step in on the nginx image in the Dockerfile? This should fix the pipeline. Will merge it if it runs green.

@jvies jvies force-pushed the expand_nginx_conf branch from 61c717e to 9da69c5 Compare November 21, 2023 16:32
@mriedmann
Copy link
Owner

I might made an error sorry ... deleting the dir might not be what we wanted ... rather deleting the content of it RUN rm /etc/nginx/conf.d/*

sorry

@jvies jvies force-pushed the expand_nginx_conf branch from 9da69c5 to 9810b4f Compare November 21, 2023 17:51
@jvies
Copy link
Contributor Author

jvies commented Nov 21, 2023

seems better thx !
I rebase and push again.

@jvies jvies force-pushed the expand_nginx_conf branch from 9810b4f to 111afd5 Compare November 21, 2023 17:58
@mriedmann mriedmann merged commit cb1e589 into mriedmann:master Nov 22, 2023
19 checks passed
@jvies jvies deleted the expand_nginx_conf branch December 2, 2023 11:58
dantefromhell added a commit to dantefromhell/humhub-docker that referenced this pull request Dec 18, 2023
As of PHP8 under Alpine `/usr/bin/php`  does not exist anymore in order to allow co-existence with `php7` packages.
The composer therefore fails when trying to execute `php`.

Weirdly this issue first surfaced with PR mriedmann#285 but not earlier - not sure why.

See https://gitlab.alpinelinux.org/alpine/aports/-/issues/12308
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants