Skip to content

Commit

Permalink
Merge branch 'release/version-1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfmorton committed Jan 21, 2022
2 parents 6c9b6a8 + 258ca9b commit 1deacfe
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
*.psd
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## 1.0.1 - 2022-01.21

### Added
* I rebuilt the image to work on multiple platforms, not just the M1 Mac version I initially published.
## 1.0.0 - 2021-12.23
### Added
* Initial release
45 changes: 45 additions & 0 deletions NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Notes on the project

These are notes I have for myself regarding this project. They're not overly organized but they're here to capture my train of thought during the work process in case I need to reference them later.

---

I needed to make this image cross platform. My image was build on my M1 Mac and didn't work natively on Intel now.

Andrew said I [buildx](https://github.com/docker/buildx/) would help me solve this issue.

First, I created a builder for buildx. I also referenced [Building Multi-Arch Images for Arm and x86 with Docker Desktop](https://www.docker.com/blog/multi-arch-images/)

```
docker buildx create --name jmxBuilder
```

I then told docker to use it when running buildx:

```
docker buildx use jmxBuilder
```

I can see it by inspecting it. Note that --bootstrap isn’t needed, it just starts the build container immediately.

```
docker buildx inspect --bootstrap
```

Now I can build and push this with this command. Notice that this tags both the development version and the latest version at the same time.

```
docker buildx build --push --no-cache --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag johnfmorton/squoosh:dev --tag johnfmorton/squoosh:latest .
```

To only tag a dev version do this:

```
docker buildx build --push --no-cache --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag johnfmorton/squoosh:dev .
```

To only tag a 'latest' version do this:

```
docker buildx build --push --no-cache --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag johnfmorton/squoosh:latest .
```
2 changes: 1 addition & 1 deletion OVERVIEW-for-DockerHub.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker run --rm -it -v `pwd`:/app johnfmorton/squoosh
You will be presented with another command prompt from within the container. You can now execute a squoosh-cli command. For example:

```
squoosh-cli --wp2 auto *.png
squoosh-cli --webp auto *.png
```

Refer to the [documentation](https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli) for an exhaustive list of options for Squoosh CLI.
Expand Down

0 comments on commit 1deacfe

Please sign in to comment.