kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity
3,107 Commits 3 Branches 0 Tags 47 MiB
ef87a79588
Commit Graph

206 Commits

Author SHA1 Message Date
Andrea Luzzardi
05cc2adec5
Merge pull request #1740 from talentedmrjones/remove-up-command 
removes dagger up in favor of dagger do
 2022-03-10 10:21:48 -08:00
Andrea Luzzardi
d79c377205
Merge pull request #1729 from helderco/remove-path-lookup 
Remove path based task lookup
 2022-03-09 15:17:55 -08:00
Richard Jones
6b81dc439d
removed dagger up in favor of dagger do 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-03-09 14:00:45 -07:00
Gerhard Lazu
1974dd1df7
Update Europa docs - CI/CD in your local dev to the new netlify.cue 
Follow-up to https://github.com/dagger/dagger/pull/1693

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
 2022-03-09 17:01:39 +00:00
Helder Correia
34b6c289dd
Remove path based task lookup 
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-03-09 11:29:26 -01:00
Jffarge
c2ff0ae377
Merge pull request #1712 from dagger/dependabot/npm_and_yarn/pkg/universe.dagger.io/examples/todoapp/nanoid-3.1.31 
LGTM
build(deps): bump nanoid from 3.1.9 to 3.1.31 in /pkg/universe.dagger.io/examples/todoapp
 2022-03-09 09:20:47 +01:00
Jffarge
d05ff277ae
Merge pull request #1713 from dagger/dependabot/npm_and_yarn/pkg/universe.dagger.io/examples/todoapp/url-parse-1.5.10 
LGTM
build(deps): bump url-parse from 1.5.3 to 1.5.10 in /pkg/universe.dagger.io/examples/todoapp
 2022-03-09 09:20:10 +01:00
Jffarge
d1ae1837ef
Merge pull request #1714 from dagger/dependabot/npm_and_yarn/pkg/universe.dagger.io/examples/todoapp/follow-redirects-1.14.9 
build(deps): bump follow-redirects from 1.13.0 to 1.14.9 in /pkg/universe.dagger.io/examples/todoapp
 2022-03-09 09:19:23 +01:00
Andrea Luzzardi
321ef8b966 ci: remove test-docs GH workflow 
The file is entirely commented and I keep getting e-mails from GH on
each PR complaining about ".github/workflows/test-docs.yml: No jobs were
run"

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2022-03-08 16:19:14 -08:00
Andrea Luzzardi
f72dde1d0d
Merge pull request #1704 from helderco/inputs-outputs-cleanup 
Inputs/outputs cleanup
 2022-03-08 16:16:15 -08:00
Richard Jones
57cea9eb6c
implements dagger project update 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-03-08 16:58:20 -07:00
Andrea Luzzardi
64e8afb3f3
Merge pull request #1681 from helderco/trim-secret 
Add #TrimSecret task
 2022-03-08 15:51:32 -08:00
dependabot[bot]
3faea70792
build(deps): bump follow-redirects 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.9.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.9)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-08 22:32:59 +00:00
dependabot[bot]
711822f680
build(deps): bump url-parse in /pkg/universe.dagger.io/examples/todoapp 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-08 22:32:55 +00:00
dependabot[bot]
a9fe5d8f16
build(deps): bump nanoid in /pkg/universe.dagger.io/examples/todoapp 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.9 to 3.1.31.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.9...3.1.31)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-08 22:32:42 +00:00
Gerhard Lazu
c3f21958d2
Europa docs: From local dev to CI environment doc page 
The todoapp example contains a Netlify plan which uses the latest dagger
additions: do & Client API. We are thinking of merging the examples
repository into this one to make working with this easier. This is a
step in that direction.

We are not using the yarn package so that we can revert
https://github.com/dagger/dagger/pull/1673 without breaking this
implementation.

The GitHub Action is WIP, we will continue with that tomorrow:
https://github.com/dagger/dagger-for-github/issues/24

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
 2022-03-08 22:17:24 +00:00
Helder Correia
24d3f82fc7
Cleanup inputs, outputs and proxy 
Superceded by Client API.

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-03-08 20:45:28 -01:00
Helder Correia
da90baa087
Add new Client API 
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-03-07 17:13:16 -01:00
Richard Jones
1f5a89091c
Merge pull request #1685 from talentedmrjones/dagger-project-init 
Implements dagger project init
 2022-03-04 15:58:37 -07:00
Richard Jones
7bcf9a9402
Implements dagger project init 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-03-04 15:44:11 -07:00
Gerhard Lazu
26d24e6ac0
First attempt at restoring the container.input interface 
The goal is to preserve the container.input interface so that custom
images can be specified, as per yarn/test/test.cue while keeping the
initial fix for https://github.com/dagger/dagger/issues/1670

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
 2022-03-04 18:41:21 +00:00
Gerhard Lazu
089d464802
Extract yarn install into a separate step 
If multiple yarn.#Run commands run in parallel, they will corrupt each
other's yarn cache mount. Because we extract yarn install into a
separate step, LLB will dedup the yarn install step and only run it
once, regardless how many yarn.#Run commands run in parallel.

Fixes https://github.com/dagger/dagger/issues/1670

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
 2022-03-04 18:38:35 +00:00
Helder Correia
5ca5f8a729
Add #TrimSecret task 
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-03-03 14:58:30 -01:00
Sam Alba
3421a8efce pkg: docker: add the command exit code 
Signed-off-by: Sam Alba <samalba@users.noreply.github.com>
 2022-02-24 17:48:18 -08:00
Solomon Hykes
1135398bee
Merge pull request #1644 from shykes/go-fix 
go.#Build: small improvements
 2022-02-23 14:05:13 -08:00
Solomon Hykes
f6cee7f306 go.#Build: small improvements 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-23 21:45:13 +00:00
Richard Jones
2b3f6e832e
Implemented universe/aws and universe/aws/cli 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-02-23 14:36:27 -07:00
Joel Longtine
a768ed13c7 Fix go.#Build 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-02-23 12:20:01 -07:00
Joel Longtine
16b66773f3 Add updated .gitignore files 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-02-23 12:20:01 -07:00
Joel Longtine
072d144e68 Fix cue mod init 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-02-23 12:20:01 -07:00
Joel Longtine
43a46128e0 Remove pre-Europa tests 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-02-23 12:20:01 -07:00
Joel Longtine
4e1b6173be Remove state (State + Project) 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-02-23 12:20:01 -07:00
Solomon Hykes
97151b911d
Merge pull request #1600 from TomChv/europa/port-go-package 
Port go package to universe
 2022-02-18 19:34:24 -08:00
Tom Chauveau
1e384c4e9a
Apply Solomon comments 
- Simplify cache id parameter with a field `name`
- Configure GOOS & GOARCH values
- Container image can now be overridden
- Simplify build export

Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-02-18 15:30:34 +01:00
Vasek - Tom C
ce4c1f036f
Resolves #1559 
Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-02-18 15:17:33 +01:00
Vasek - Tom C
73829fd9a7
Fix docker.#Run exportFile test. 
This test was not calling `docker.#Run` so basically it wasn't doing anything.

Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-02-18 15:15:32 +01:00
Solomon Hykes
18e778c894
Merge pull request #1636 from shykes/yarn-run 
yarn: split #Run and #Build
 2022-02-17 13:12:31 -08:00
Solomon Hykes
824573521e yarn: split #Run and #Build 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-17 20:28:41 +00:00
Tom Chauveau
2887139bf7
Apply Solomon comments on universe.dagger.io/go 
- Improve #Container with a better docker.#Run integration
- Supports concurrency caching in #Container
- Simplify code maintainability and readability
- Simplify binary export in #Build
- Support multi binary building
- External #Version management

Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-02-17 16:01:16 +01:00
Tom Chauveau
e49bb34e87
Port go package to universe to resolves #1553 
Definition are now split in their own file.
`#Image` is a simple base image to set up a go container
`#Container` is a standalone environment to execute go command, any go command
should use this definition.
It shares `docker.#Run` fields to easily maintains this definition.
`#Build` and `#Test` are high level definition that use `#Container` to
execute common go operation in a CI.

Those definitions are tested with a simple greeting package.

Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-02-17 14:57:06 +01:00
Helder Correia
9385a6346a
Rename image config field for consistency 
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-02-17 11:14:57 -01:00
Solomon Hykes
c2766c265b Merge dagger.io/dagger/engine into dagger.io/dagger 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-16 19:40:28 +00:00
Andrea Luzzardi
bf6d463833
Merge pull request #1557 from talentedmrjones/europa-engine-exec-secret-env 
implemented ability to pass #Secret as env var
 2022-02-15 16:30:13 -07:00
Solomon Hykes
3d56513895 Rename dagger.#DAG to dagger.#Plan 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-15 22:45:47 +00:00
Richard Jones
3c57630b0e
implemented ability to pass #Secret as env var 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-02-15 12:58:35 -07:00
Solomon Hykes
a6502c7947 yarn: enable image customization 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-12 07:40:30 +00:00
Solomon Hykes
fbae253f62 netlify: enable image customization; improve tests 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-11 23:31:35 +00:00
sw360cab
e6244aeedc Add Feature to leverage custom command inside Docker.#Run 
Signed-off-by: Sergio Maria Matone <sw360cab@gmail.com>
 2022-02-11 01:02:44 +00:00
Solomon Hykes
ce1a5659eb docker.#Run: remove redundant image field 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 19:59:22 +00:00
Solomon Hykes
b251528535
Merge pull request #1585 from shykes/universe-tests 
yarn: cleanup tests
 2022-02-09 09:30:33 -08:00
Solomon Hykes
b23a90c9b1 yarn: cleanup tests 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 08:58:34 +00:00
Solomon Hykes
e8a62cb3aa universe.dagger.io/examples/changelog.com: successful build 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 08:49:44 +00:00
Solomon Hykes
5a1ce0acac universe.dagger.io/examples/changelog.com: cleanup and fixes 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 08:34:54 +00:00
Solomon Hykes
80f9a65ca7 Fix cue eval from pkg/universe.dagger.io 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 08:04:24 +00:00
Solomon Hykes
7502bc876b netlify: cleanup tests 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 01:41:36 +00:00
Solomon Hykes
20e1ac9d7f docker: cleanup tests 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 01:41:36 +00:00
Solomon Hykes
090ecfb9f2 bash: cleanup tests 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 01:41:36 +00:00
Solomon Hykes
cf6fadbeda alpine: cleanup tests 
Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-09 01:41:33 +00:00
Solomon Hykes
e6b5fd3de9 yarn.#Build: simpler API, better tests 
* Remove mandatory 'cache' field
* New 'name' field to customize cache IDs instead
* Simplify and expand tests

Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-08 23:02:03 +00:00
Solomon Hykes
013900c2a2 bash.#Run: new and improved 
* Script is written to filesystem, not inlined as argument
* Pass script either as string, or directory+filename

Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-08 22:00:25 +00:00
Solomon Hykes
3231d69d06
Merge pull request #1550 from talentedmrjones/europa-decode-secret-task 
implemented #DecodeSecret as engine task
 2022-02-08 11:48:14 -08:00
Solomon Hykes
298a119b09
Merge pull request #1569 from shykes/docker-run-tweak 
Simplify docker.#Run
 2022-02-08 09:58:22 -08:00
Guillaume Coguiec
bd0f276d30
typo: Fix some minor typos. 
Signed-off-by: Guillaume Coguiec <guillaume@logical.work>
 2022-02-07 21:10:25 -05:00
Solomon Hykes
354334a3dc Simplify docker.#Run 
* `cmd` is renamed to `command` for readability
  * `script` is removed. Feature moves up the stack (bash.#Run,
    python.#Run)

Signed-off-by: Solomon Hykes <solomon@dagger.io>
 2022-02-08 01:35:51 +00:00
Richard Jones
a087161fbb implemented #DecodeSecret as engine task 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-02-04 14:03:55 -07:00
Andrea Luzzardi
55a9c9100d logger: collapse logs for hidden fields 
This change "collapses" together log "groups" containing hidden fields
for the TTY logger.

e.g. `actions.foo._a` and `actions.foo_b` will show up as a combined `actions.foo`.

Caveats: Since we don't know in advance how many tasks are in a group, the state will change back and forth.
For each task in a group, the state will transition from computing to complete (e.g. blue to green), then back to computing and so on.
The transition is fast enough not to be visibile.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2022-02-04 10:03:14 -08:00
Sam Alba
1d1ce2ba28 universe: add note about package pinning for later 
Signed-off-by: Sam Alba <samalba@users.noreply.github.com>
 2022-02-02 14:59:47 -08:00
Andrea Luzzardi
1f97da4eb9 Fix nested vendoring 
For code embedding (e.g. deploy.sh), we've changed vendor embedding to
include all contents instead of just CUE files #1526.

The problem is we're vendoring the package's `cue.mod/pkg`.

This fixes it.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2022-01-31 17:06:00 -08:00
Andrea Luzzardi
676a895a0f
Merge pull request #1535 from helderco/docker-set 
Set image metadata
 2022-01-31 16:09:22 -08:00
Andrea Luzzardi
946629d1fa
Merge pull request #1534 from grouville/reconcile-auth 
Reconcile docker.#Push.auth and engine.#Push.auth
 2022-01-31 16:08:53 -08:00
Helder Correia
9e33a09903
Add docker.#Set for updating image metadata 
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-01-31 22:44:55 -01:00
guillaume
d3dca120f7 Implement modifications for engine.#Dockerfile tests, and fix lint errors 
Signed-off-by: guillaume <guillaume.derouville@gmail.com>
 2022-02-01 00:35:02 +01:00
guillaume
ac30274d96 Implement modifications for engine.#Pull, engine.#Push, docker.#Push, docker.#Pull 
Signed-off-by: guillaume <guillaume.derouville@gmail.com>
 2022-01-31 23:14:35 +01:00
Helder Correia
813a476e06
Add outputs.files task to plan 
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-01-31 20:53:54 -01:00
Andrea Luzzardi
025ce14ed3
Merge pull request #1526 from TomChv/fix/embed-sh-script 
Embed shell script into universe
 2022-01-28 15:22:26 -08:00
Vasek - Tom C
6f5095ec19
Fix permissions issue and doc generation issue 
Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-01-28 23:17:52 +01:00
Vasek - Tom C
32b48f7dce
Optimize tests with simpler workflow 
Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-01-28 22:04:16 +01:00
Vasek - Tom C
5de86cb1ee
Embed all files instead of just cue file 
Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-01-28 22:02:21 +01:00
Tom Chauveau
26b2ef8697
Add tests on docker.#Build definition 
- Simple build test
- Multi step to build a go binary

Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-01-28 21:17:33 +01:00
Richard Jones
4f2c6e55e4
added DecodeSecret as a wrapper to TransformSecret; supports yaml and json secrets 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-01-28 12:26:22 -07:00
Joel Longtine
cc54aa6795 Clean up changes from #1505 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-01-28 11:15:44 -07:00
Joel Longtine
b0b84db5e8 Close #ImageConfig 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-01-28 10:59:09 -07:00
Joel Longtine
0de625e1c3 cue fmt 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-01-28 10:57:30 -07:00
Joel Longtine
6db42168e4 Tests! 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-01-28 10:57:30 -07:00
Joel Longtine
dcef2958cf Use image.config in docker.#Run 
Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-01-28 10:57:25 -07:00
Joel Longtine
7788b9f2f3
Merge pull request #1505 from helderco/image-config 
Make env in ImageConfig a map
 2022-01-28 10:48:31 -07:00
Joel Longtine
7b8a637bea
Merge pull request #1519 from jlongtine/mod-get-europa 
Remove dependence on project, use cue.mod path.
 2022-01-28 10:39:25 -07:00
Richard Jones
da58dfa5a4
fixed shadowing 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-01-28 10:06:02 -07:00
Vasek - Tom C
fcd90fa78a
Solves #1512 
Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-01-28 15:27:32 +01:00
Richard Jones
23b07215d8
fix universe packages 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-01-27 20:20:37 -07:00
Richard Jones
7eb10f96fb
engine.#Copy matches docker.#Copy 
Signed-off-by: Richard Jones <richard@dagger.io>
 2022-01-27 20:09:12 -07:00
Joel Longtine
b33d6b2243 Remove dependence on project, use cue.mod path. 
Ensure that we have done an init in this folder.

Also, force a clean checkout of the tag we've chosen to upgrade to.

Signed-off-by: Joel Longtine <joel@dagger.io>
 2022-01-27 16:54:42 -07:00
Gerhard Lazu
5719ccbc96
Add a new make target that provisions dagger-ci declaratively 
While at it, add help make target & make it the default.
This explains all make targets. Run `make help` to see it in action 😉

dagger-ci-pr1499-2022-01-26 API token was added as an AGE secret. It can
be accessed only by the intended recipients are able to decrypt it with
their private SSH keys.

    echo "TOKEN" | age -R .age.recipients.txt -o .do.dagger-ci-pr1499-2022-01-26.age

Do not assume that /bin/true exists on hosts running Docker.  Use "true"
and let the system resolve the path.

Re-enable all ssh Universe tests.

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
 2022-01-26 23:13:59 +00:00
Helder Correia
c276a8b8ba
Make env in ImageConfig a map 
Fields in CUE were renamed to the lowercase version of Dockerfile instructions.

There's now opportunity to make other fields simpler to use (e.g., healthcheck), this commit is focused on env.

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
 2022-01-26 17:12:08 -01:00
Gerhard Lazu
0be326ade9
Restore all disabled tests that depend on ssh 
This requires us to spin up a new dagger-ci VM, as mentioned here:
https://github.com/dagger/dagger/pull/1493#issuecomment-1021080655

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
 2022-01-26 12:44:14 +00:00
Gerhard Lazu
2715b7b6d0
Merge pull request #1493 from aluzzardi/test-disable-ssh 
test: disable tests relying on SSH
 2022-01-25 11:15:51 +00:00
Andrea Luzzardi
b242a2b9bc test: disable tests relying on SSH 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2022-01-24 17:21:05 -08:00
Vasek - Tom C
4ab852347b
Add test on docker.#Run 
Signed-off-by: Vasek - Tom C <tom.chauveau@epitech.eu>
 2022-01-22 13:33:23 +01:00
Andrea Luzzardi
a6330f8167
Merge pull request #1479 from aluzzardi/yarn-test-cleanup 
test: clean up yarn test
 2022-01-21 16:52:44 -08:00
Andrea Luzzardi
8ff72a5fa3 test: clean up yarn test 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2022-01-21 12:45:59 -08:00