Skip to content

Commit

Permalink
CI/CD: Cleanup github action inputs
Browse files Browse the repository at this point in the history
  • Loading branch information
richturner committed Apr 5, 2022
1 parent 40c74b4 commit 4035798
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ allprojects {
// Each file must be explicitly added to .gitignore otherwise git commit will fail
// When using encryption the the GFE_PASSWORD environment variable must be set or the build will fail
// use ./gradlew encryptFiles to encrypt files

//apply plugin: "com.cherryperry.gradle-file-encrypt"
//gradleFileEncrypt {
// // files to encrypt
// plainFiles.from("deployment/manager/fcm.json")
Expand All @@ -27,7 +29,7 @@ allprojects {
//task checkFilesGitIgnoredNew(type: Exec) {
// // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
// def args = []
// if (isFamily(FAMILY_WINDOWS)) {
// if (org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)) {
// args.add("cmd")
// args.add("/c")
// }
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ services:
environment:
LE_EMAIL: ${OR_EMAIL_ADMIN}
DOMAINNAME: ${OR_HOSTNAME?OR_HOSTNAME must be set}
DOMAINNAMES: $[OR_ADDITIONAL_HOSTNAMES:-}
# USE A CUSTOM PROXY CONFIG - COPY FROM https://github.com/openremote/proxy/blob/main/haproxy.cfg
#HAPROXY_CONFIG: '/data/proxy/haproxy.cfg'
<<: *awslogs
Expand Down Expand Up @@ -108,7 +109,7 @@ services:
volumes:
- temp-data:/tmp
- deployment-data:/deployment
# Map data is stored local on host
# Map data should be stored local on host
- /deployment.local:/deployment.local
environment:
# Here are some typical environment variables you want to set
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#
projectName = custom-project
projectVersion = 1.0-SNAPSHOT

0 comments on commit 4035798

Please sign in to comment.