Skip to content

Checking upstream #52

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.

Sign up for GitHub

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

Closed
m-mohamedin wants to merge 39 commits into from
+381 −778
Closed

Checking upstream #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
69a9b3d
Updated concourse pipeline
fjudith Oct 25, 2020
06a73fc
Merge branch 'master' of https://github.com/fjudith/docker-draw.io
fjudith Oct 25, 2020
c395d9f
Fixed branch targetting
fjudith Oct 25, 2020
6937b53
Fixed multiline
fjudith Oct 25, 2020
4ca2d04
Fixed typo
fjudith Oct 25, 2020
d04bb2d
Added microbadger labels
fjudith Oct 25, 2020
789d91e
Fixed typo
fjudith Oct 25, 2020
9d66d91
Fixed typo in docker build
fjudith Oct 25, 2020
2e82114
Fixed build arguments
fjudith Oct 25, 2020
c8131c8
Stop on error
fjudith Oct 25, 2020
9889d35
Fixed quoting
fjudith Oct 25, 2020
318c364
Reduced verbosity
fjudith Oct 25, 2020
69481ad
Updated microbadger webhook
fjudith Nov 7, 2020
a5bdd54
Fixed typo
fjudith Nov 7, 2020
71e8fa5
Added Github actions
fjudith Jan 11, 2021
a483fd9
Moved assets to appropriate directories
fjudith Jan 11, 2021
57e4743
Fixed actions
fjudith Jan 11, 2021
5a0a93c
Fixed environment variables
fjudith Jan 11, 2021
f597068
Fixed typo
fjudith Jan 11, 2021
96b6c25
Fixed entrypoint script permissions
fjudith Jan 11, 2021
4c49739
Remove Travis-CI build
fjudith Jan 11, 2021
80c29cb
Added docker image build arguments
fjudith Jan 11, 2021
beb4195
Fixed build date
fjudith Jan 11, 2021
feaeaa0
Fixed draw.io version download
fjudith Jan 11, 2021
7c8facf
Update docker_image.yaml
fjudith Mar 17, 2021
1b3f7d3
Create docker_image.yaml
fjudith Mar 17, 2021
062cb84
Update docker_image.yaml
fjudith Mar 17, 2021
587ac3f
Fixed crontab
fjudith May 18, 2021
58db243
Update docker_image.yaml
fjudith Nov 14, 2021
c3c20ac
Update Dockerfile
fjudith Nov 14, 2021
7d3758b
Update Dockerfile
fjudith Nov 14, 2021
e3239e6
Update Dockerfile
fjudith Nov 14, 2021
c7a21f3
Update Dockerfile
fjudith Nov 14, 2021
6ba8d38
Update Dockerfile
fjudith Nov 14, 2021
0e25e23
Update Dockerfile
fjudith Nov 14, 2021
142340f
Update Dockerfile
fjudith Nov 15, 2021
95f1e1b
Update Dockerfile
fjudith Nov 15, 2021
a255cf0
Update docker_image.yaml
fjudith Nov 15, 2021
67966f2
Create LICENSE
fjudith Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved assets to appropriate directories
  • Loading branch information
@fjudith
fjudith committed Jan 11, 2021
commit a483fd90e1a3ca6825150e57503c160578d552d6
2 changes: 1 addition & 1 deletion .github/workflows/docker_image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
VERSION_FILE: "./drawio/VERSION"

jobs:
build-image:
image-build:
name: "Building ${{ matrix.drawio }} base image"
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ RUN cd $CATALINA_HOME && \
conf/server.xml

# Copy draw.io config files
COPY PreConfig.js PostConfig.js $CATALINA_HOME/webapps/draw/js/
COPY files/PreConfig.js files/PostConfig.js $CATALINA_HOME/webapps/draw/js/
# Copy docker-entrypoint
COPY docker-entrypoint.sh /
COPY scripts/docker-entrypoint.sh /

WORKDIR $CATALINA_HOME

Expand Down
0 alpine/PostConfig.js → alpine/files/PostConfig.js
View file
Open in desktop
File renamed without changes.
0 alpine/PreConfig.js → alpine/files/PreConfig.js
View file
Open in desktop
File renamed without changes.
0 alpine/docker-entrypoint.sh → alpine/scripts/docker-entrypoint.sh
100755 → 100644
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ RUN cd $CATALINA_HOME && \
conf/server.xml

# Copy draw.io config files
COPY PreConfig.js PostConfig.js $CATALINA_HOME/webapps/draw/js/
COPY files/PreConfig.js files/PostConfig.js $CATALINA_HOME/webapps/draw/js/
# Copy docker-entrypoint
COPY docker-entrypoint.sh /
COPY scripts/docker-entrypoint.sh /

WORKDIR $CATALINA_HOME

Expand Down
0 debian/PostConfig.js → debian/files/PostConfig.js
View file
Open in desktop
File renamed without changes.
0 debian/PreConfig.js → debian/files/PreConfig.js
View file
Open in desktop
File renamed without changes.
0 debian/docker-entrypoint.sh → debian/scripts/docker-entrypoint.sh
100755 → 100644
View file
Open in desktop
File renamed without changes.