Skip to content
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

feat(ecr-assets): Support .dockerignore (faster Docker builds) #4104

Merged
merged 12 commits into from
Sep 22, 2019
Merged

feat(ecr-assets): Support .dockerignore (faster Docker builds) #4104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d824cc9
Support .dockerignore (faster Docker builds)
parisholley Sep 16, 2019
a77d0b7
ts fix
parisholley Sep 16, 2019
da0b3eb
test update and lint fix
parisholley Sep 19, 2019
fb9d82c
exclude dockerignore so it does not influence hashing
parisholley Sep 19, 2019
fa5d8f3
Merge branch 'master' into patch-1
parisholley Sep 19, 2019
a61362b
tweaks
parisholley Sep 20, 2019
737974c
Merge branch 'patch-1' of github.com:parisholley/aws-cdk into patch-1
parisholley Sep 20, 2019
08fd079
remove verify from other test
parisholley Sep 20, 2019
ee7b6b4
revert
parisholley Sep 20, 2019
b1a8fbb
more revert
parisholley Sep 20, 2019
b0366a7
Merge branch 'master' into patch-1
parisholley Sep 20, 2019
bf1e90f
Merge branch 'master' into patch-1
mergify[bot] Sep 22, 2019
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
11 changes: 10 additions & 1 deletion packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,17 @@ export class DockerImageAsset extends cdk.Construct implements assets.IAsset {
throw new Error(`No 'Dockerfile' found in ${dir}`);
}

let exclude: string[] = ['.dockerignore'];

const ignore = path.join(dir, '.dockerignore');

if (fs.existsSync(ignore)) {
exclude = [...exclude, ...fs.readFileSync(ignore).toString().split('\n').filter(e => !!e)];
}

const staging = new assets.Staging(this, 'Staging', {
...props,
exclude,
sourcePath: dir
});

Expand Down Expand Up @@ -126,7 +135,7 @@ export class DockerImageAsset extends cdk.Construct implements assets.IAsset {
}

function validateBuildArgs(buildArgs?: { [key: string]: string }) {
for (const [ key, value ] of Object.entries(buildArgs || {})) {
for (const [key, value] of Object.entries(buildArgs || {})) {
if (Token.isUnresolved(key) || Token.isUnresolved(value)) {
throw new Error(`Cannot use tokens in keys or values of "buildArgs" since they are needed before deployment`);
}
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foobar.txt
5 changes: 5 additions & 0 deletions packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM python:3.6
EXPOSE 8000
WORKDIR /src
ADD . /src
CMD python3 index.py
Empty file added packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image/foobar.txt
View file
Open in desktop
Empty file.
33 changes: 33 additions & 0 deletions packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python
import sys
import textwrap
import http.server
import socketserver

PORT = 8000


class Handler(http.server.SimpleHTTPRequestHandler):
def do_GET(self):
self.send_response(200)
self.send_header('Content-Type', 'text/html')
self.end_headers()
self.wfile.write(textwrap.dedent('''\
<!doctype html>
<html><head><title>It works</title></head>
<body>
<h1>Hello from the integ test container</h1>
<p>This container got built and started as part of the integ test.</p>
<img src="https://media.giphy.com/media/nFjDu1LjEADh6/giphy.gif">
</body>
''').encode('utf-8'))


def main():
httpd = http.server.HTTPServer(("", PORT), Handler)
print("serving at port", PORT)
httpd.serve_forever()


if __name__ == '__main__':
main()
17 changes: 17 additions & 0 deletions packages/@aws-cdk/aws-ecr-assets/test/test.image-asset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,23 @@ export = {
test.done();
},

'docker directory is staged without files specified in .dockerignore'(test: Test) {
const app = new App();
const stack = new Stack(app, 'stack');

new DockerImageAsset(stack, 'MyAsset', {
directory: path.join(__dirname, 'dockerignore-image')
});

const session = app.synth();

test.ok(fs.existsSync(path.join(session.directory, `asset.1a17a141505ac69144931fe263d130f4612251caa4bbbdaf68a44ed0f405439c/Dockerfile`)));
test.ok(fs.existsSync(path.join(session.directory, 'asset.1a17a141505ac69144931fe263d130f4612251caa4bbbdaf68a44ed0f405439c/index.py')));
test.ok(!fs.existsSync(path.join(session.directory, 'asset.1a17a141505ac69144931fe263d130f4612251caa4bbbdaf68a44ed0f405439c/foobar.txt')));

test.done();
},

'fails if using tokens in build args keys or values'(test: Test) {
// GIVEN
const stack = new Stack();
Expand Down