| version: '2.2' | |
| services: | |
| elasticsearch: | |
| image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.0 | |
| environment: | |
| - "discovery.type=single-node" | |
| - "ES_JAVA_OPTS=-Xmx256m -Xms256m" | |
| ulimits: | |
| memlock: |
| aws sts get-caller-identity |
| //Launch MyViewController options | |
| URLProtocol.registerClass(ZDKAuthenticationURLProtocol.self) | |
| let jwtUserIdentity = ZDKJwtIdentity(jwtUserIdentifier:idToken) | |
| ZDKConfig.instance().userIdentity = jwtUserIdentity | |
| let helpCenterContentModel = ZDKHelpCenterOverviewContentModel.defaultContent() | |
| ZDKHelpCenter.presentOverview(self, with: helpCenterContentModel) |
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
| #!/bin/bash | |
| # Set defaults if not provided by environment | |
| CHECK_DELAY=${CHECK_DELAY:-5} | |
| CHECK_IP=${CHECK_IP:-8.8.8.8} | |
| PRIMARY_IF=${PRIMARY_IF:-eth2} | |
| PRIMARY_GW=${PRIMARY_GW:-192.168.1.1} | |
| BACKUP_IF=${BACKUP_IF:-eth1} | |
| BACKUP_GW=${BACKUP_GW:-192.168.3.1} |
