Skip to content

Commit

Permalink
#127 consolidated build in Dockerfile
Browse files Browse the repository at this point in the history
changed repository.url in package.json
  • Loading branch information
FreeAndNil committed Mar 19, 2024
1 parent 54709d8 commit e22bb39
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 47 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ ENV DOTNET_ROOT=/root/.dotnet
ENV PATH="$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools"

ADD . /logging-log4net
RUN chmod +x /logging-log4net/docker-build/docker-build.sh
ADD ./docker-build/.bashrc /root/.bashrc
RUN dotnet restore /logging-log4net/src/log4net.sln
RUN dotnet build /logging-log4net/src/log4net.sln
CMD /bin/bash
4 changes: 2 additions & 2 deletions doc/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ TL;DR (Docker):
- https://docs.docker.com/engine/install/
- in logging/log4net run
- `docker build -t log4net-builder .`
- `docker run -it log4net-builder /bin/bash`
- `docker run -it log4net-builder`
- this will
- install all dependencies in the container
- build src/log4net.sln
- inside the container run
- `dotnet test ../src/log4net.sln` (gets printed after building)
- `dotnet test /logging-log4net/src/log4net.sln`

TL;DR (!Windows):
- install the dotnet SDK - v8 or better
Expand Down
21 changes: 0 additions & 21 deletions docker-build/.bashrc

This file was deleted.

21 changes: 0 additions & 21 deletions docker-build/docker-build.sh

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/fluffynuts/logging-log4net.git"
"url": "git+ssh://git@github.com/apache/logging-log4net.git"
},
"author": "",
"license": "Apache-2.0",
Expand Down

0 comments on commit e22bb39

Please sign in to comment.