Jane Ullah janoulle

Keybase proof

I hereby claim:

I am janoulle on github.
I am janeullah (https://keybase.io/janeullah) on keybase.
I have a public key ASDNihFGZM_H4jjuu9tfececf9hctyuL54srXLDKbap6Awo

To claim this, I am signing this object:

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

	sample docker-compose file

	# Use postgres/example user/password credentials
	version: '3.1'

	networks:
	myapp-network:

	services:

	//generates image like this: $project.group/applicationName:tagVersion
	task image(type: Docker, dependsOn: build ) {
	project.group = '' //this prevents the generated image from having the group value added. Personal preference to do this
	applicationName = "yourapp"
	dockerfile = file('Dockerfile')
	tagVersion = 'latest'
	doFirst {
	copy {
	from jar
	into "${stageDir}/target"

	# https://g00glen00b.be/docker-spring-boot/
	# Using the alpine image as a base
	FROM openjdk:8-jdk-alpine

	# maintainer
	MAINTAINER "Jane Doe <janedoe@gmail.com>"

	# http://blog.zot24.com/tips-tricks-with-alpine-docker/ For keeping size small
	RUN apk add --no-cache curl

	package com.clario.aws

	import com.amazonaws.DefaultRequest
	import com.amazonaws.SignableRequest
	import com.amazonaws.auth.AWS4Signer
	import com.amazonaws.auth.AWSCredentialsProvider
	import com.amazonaws.http.HttpMethodName
	import groovy.util.logging.Slf4j
	import org.apache.http.client.utils.URLEncodedUtils
	import org.springframework.http.HttpHeaders

	columns.Command(
	command.Custom("Remove").Click("removeForm").Text("Approve")
	command.Custom("Approve").Click("approveForm").Text("Approve");
	)

	//removeForm and approveForm are JavaScript functions

	<script type="text/javascript">
	function removeForm(e){
	e.preventDefault();

	=== Fetching app code failed

	=!= Your app does not include a heroku.yml build manifest. To deploy your app, either create a heroku.yml: https://devcenter.heroku.com/articles/heroku-yml-build-manifest

	Or change your stack by running: 'heroku stack:set heroku-16'