Skip to content

Commit 365042a

Browse files
authored
refactor: move Dockerfile sources & test under src/main/docker and src/test/docker respectively (#67)
1 parent 2f408d5 commit 365042a

File tree

15 files changed

+5
-6
lines changed

15 files changed

+5
-6
lines changed

.github/semantic-release/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [[ -z "$ROOT_PROJECT_DIR" ]]; then
1010
exit 1
1111
fi
1212

13-
cd "$ROOT_PROJECT_DIR/src/main"
13+
cd "$ROOT_PROJECT_DIR/src/main/docker"
1414

1515
export REGISTRY='docker.io'
1616
export IMAGE_VERSION="$RELEASE_VERSION"

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ jobs:
7676
uses: docker/bake-action@4ba453fbc2db7735392b93edf935aaf9b1e8f747 # v6.5.0
7777
with:
7878
source: .
79-
workdir: src/main/
79+
workdir: src/main/docker/
8080
targets: dev
8181
load: true # Export to Docker - Required for tests in later steps
8282
set: |
8383
*.cache-from=type=gha,timeout=20s
8484
*.cache-to=type=gha,mode=max,timeout=20s
8585
8686
- name: Test
87-
run: src/test/test.sh
87+
run: src/test/docker/test.sh
8888

8989
- name: Run Trivy vulnerability scanner
9090
uses: aquasecurity/trivy-action@6c175e9c4083a92bbca2f9724c8a5e33bc2d97a5 # 0.30.0
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# You should have received a copy of the GNU General Public License
1818
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1919

20-
# TODO: move to src/main/docker instead
2120
# TODO: what about an alpine variant?
2221
FROM docker.io/ubuntu:noble@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 AS build
2322

@@ -75,8 +74,8 @@ COPY --from=build --chown=papermc --chmod=500 /build/papermc-server-*.jar ./
7574
# Copy the configuration files
7675
# Write access is required by PaperMC to update the configuration files
7776
# even tho we would prefer otherwise in containers (read-only access for immutability enforcement)
78-
COPY --chown=papermc --chmod=700 runtime/config/base/ ./
79-
COPY --chown=papermc --chmod=700 runtime/config/papermc/ config/
77+
COPY --chown=papermc --chmod=700 runtime/config/base ./
78+
COPY --chown=papermc --chmod=700 runtime/config/papermc config/
8079

8180
# Copy the server startup script
8281
COPY --chown=papermc --chmod=500 runtime/start.sh ./
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)