Use devcontainer in build #142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Scope dependencies --------- Co-authored-by: Matthias Simonis <[email protected]>
… to scan (cherry picked from commit c37472d)
.devcontainer/devcontainer.json
Outdated
There was a problem hiding this comment.
I moved some installation-steps from the postCreateCommand into the devcontainer-file itself
|
|
||
| sudo cp memory.ini /usr/local/etc/php/conf.d/memory.ini | ||
|
|
||
| if [[ "$IS_CI" == "true" ]]; then |
There was a problem hiding this comment.
the other stuff is just for interactive use, so we don't need that in the ci on github
| @@ -17,23 +20,47 @@ jobs: | |||
| - id: get-matrix | |||
| run: echo "nextcloud_versions=$(./get-matrix.sh)" | tee -a "$GITHUB_OUTPUT" | |||
|
|
|||
| build-devcontainer: | |||
There was a problem hiding this comment.
This build the devcontainer like described in the devcontainer.json definition. But this is just the build, so lifecycle-hooks like postCreate are not called here.
| image: ghcr.io/gdatasoftwareag/nextcloud/builder:latest | ||
| env: | ||
| IS_CI: true | ||
| options: --name nextcloud-antivirus-build-container |
There was a problem hiding this comment.
i had to set a fixed container name, because I need to put the build container into a network that it can reach the nextcloud and smtp containers.
| uses: mig4/setup-bats@v1 | ||
| with: | ||
| bats-version: 1.11.0 | ||
| - name: postCreateCommands |
There was a problem hiding this comment.
calling the postCreateCommand-Script
| @@ -3,7 +3,9 @@ ARG INSTALL_XDEBUG=1 | |||
|
|
|||
| FROM nextcloud:${NEXTCLOUD_VERSION} | |||
|
|
|||
| RUN apt update && apt install -y \ | |||
| SHELL [ "/bin/bash", "-c" ] | |||
There was a problem hiding this comment.
this was the reason why the if condition while building was not working. the docker build commands do run in sh
| @@ -1,4 +1,5 @@ | |||
| #!/bin/bash | |||
| set -e | |||
There was a problem hiding this comment.
early exit for the install script. without this, the script basically never failed in the background jobs (the ones startet with an &). This will lead to the early exit from the background jobs.
| build_app & | ||
| wait | ||
| wait %2 || exit 1 |
There was a problem hiding this comment.
this will actually fail the build script when something fails in the background jobs
lennartdohmann
approved these changes
Oct 4, 2024
GermanCoding
approved these changes
Oct 8, 2024
1 task
lennartdohmann
pushed a commit
that referenced
this pull request
Oct 22, 2024
* WIP * WIP magic * adjust scoper config * Resolve dependency hell * Make something * add build step for the nextcloud builder * add the checkout step * login to registry * use devcontainer as build-runner2 * skip the postCreate stuff when in CI * change default shell for docker build * extract some functions from the script to features * run poststartcommands in ci * fix filename * fix script for non vscode environments * remove extra install scoper step * add fail fast on install * use bash as default shell * make apt less noisy * try another fail * remove trap in distclean * add memory.ini to top * give the shell job control * just use bash * Scope dependencies (#138) Scope dependencies --------- Co-authored-by: Matthias Simonis <[email protected]> * Fix if the file size is zero, the app evaluates the file as too large to scan (cherry picked from commit c37472d) * WIP * WIP magic * adjust scoper config * Resolve dependency hell * Make something * add fail fast on install * exit early in the install script * fix stuff * add composer path to github path * split postCreate and add to path * remove the scoper installation (done in the postCreateCommand) * add container user vscode * remove vscode user * add docker ps * replace hostname in ci * add debug stuff * use static ip * show json ps * try connect the builder container to the compose network * fix name * move connect to after installation * fix hostname * add hostname to trusted_domains array * fix smtp hostname * replace quote types * remove debugging stuff --------- Co-authored-by: Lennart Dohmann <[email protected]> Co-authored-by: PT-ATA No One <[email protected]> (cherry picked from commit 06d33a6)
lennartdohmann
pushed a commit
that referenced
this pull request
Oct 23, 2024
* WIP * WIP magic * adjust scoper config * Resolve dependency hell * Make something * add build step for the nextcloud builder * add the checkout step * login to registry * use devcontainer as build-runner2 * skip the postCreate stuff when in CI * change default shell for docker build * extract some functions from the script to features * run poststartcommands in ci * fix filename * fix script for non vscode environments * remove extra install scoper step * add fail fast on install * use bash as default shell * make apt less noisy * try another fail * remove trap in distclean * add memory.ini to top * give the shell job control * just use bash * Scope dependencies (#138) Scope dependencies --------- Co-authored-by: Matthias Simonis <[email protected]> * Fix if the file size is zero, the app evaluates the file as too large to scan (cherry picked from commit c37472d) * WIP * WIP magic * adjust scoper config * Resolve dependency hell * Make something * add fail fast on install * exit early in the install script * fix stuff * add composer path to github path * split postCreate and add to path * remove the scoper installation (done in the postCreateCommand) * add container user vscode * remove vscode user * add docker ps * replace hostname in ci * add debug stuff * use static ip * show json ps * try connect the builder container to the compose network * fix name * move connect to after installation * fix hostname * add hostname to trusted_domains array * fix smtp hostname * replace quote types * remove debugging stuff --------- Co-authored-by: Lennart Dohmann <[email protected]> Co-authored-by: PT-ATA No One <[email protected]> (cherry picked from commit 06d33a6)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.