From d7b0a398bfd85ff4fc272b9792f47baf54afeb25 Mon Sep 17 00:00:00 2001 From: Aaron Couch Date: Tue, 10 Sep 2024 11:57:42 -0400 Subject: [PATCH] Specify docker platform in composer (navapbc/simpler-grants-gov#190) --- .gitignore | 3 ++ frontend/docker-compose.yml | 2 + frontend/package-lock.json | 51 ++++++------------ .../search/.SearchResultsHeader.tsx.swp | Bin 12288 -> 0 bytes 4 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 frontend/src/components/search/.SearchResultsHeader.tsx.swp diff --git a/.gitignore b/.gitignore index ccbee0178..06928cae6 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,6 @@ dmypy.json # vscode .vscode/settings.json + +# vim +*.swp diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml index 974b27b3f..79e05bef0 100644 --- a/frontend/docker-compose.yml +++ b/frontend/docker-compose.yml @@ -1,6 +1,7 @@ services: nextjs: container_name: next-dev + platform: linux/amd64 build: context: . target: dev @@ -15,6 +16,7 @@ services: storybook: container_name: storybook + platform: linux/amd64 build: context: . target: dev diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 96d0652b1..4b2b699d9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8228,26 +8228,6 @@ "integrity": "sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==", "dev": true }, - "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", - "dev": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "0.0.51", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", @@ -12382,9 +12362,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.17.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz", - "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -25237,21 +25217,20 @@ } }, "node_modules/webpack": { - "version": "5.91.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz", - "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", + "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.16.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -25344,9 +25323,9 @@ "dev": true }, "node_modules/webpack/node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -25355,10 +25334,10 @@ "node": ">=0.4.0" } }, - "node_modules/webpack/node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "node_modules/webpack/node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, "peerDependencies": { "acorn": "^8" diff --git a/frontend/src/components/search/.SearchResultsHeader.tsx.swp b/frontend/src/components/search/.SearchResultsHeader.tsx.swp deleted file mode 100644 index 5d1b2117bda8cd0ce76c88240ee7f49d146f8534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&2G~`5XZMjocOBX0a%Qv5~+?u5D40&K#>q2@mb(fIBe{7vf%8R-F4e2EpX{O zARYoC&YU^&7<>shaN-8Dj@_hD1ZU7#`gc9MvoqtL*N3RnuHV0Uot~@J30$*;e82i8 zesN)YPxU1sDbrRMCf(AXu8T}7Y5eQUw`#Fa#@8ydT-Um)$9HXeS_TZ(m40lxDh)cC zNoxYh)|hWZFHN{^1TloOTt

VGycbsw8(_hBF;@gOz-^!%dc0bA_`Aa#^#nD-{|@ z011o}$ZYJNJwQ%1PUfHbaqk#Ca`@i32i_wAB!C2v01`j~NB{{S0VMFB6R_zFc?Qq8 zr+Cg2#W*uD7A6iz00|%gB!C2v01`j~NB{{S0VIF~kib7kfJKBX>?7m@$o>Dn{Qdvq z5FzhC&p{7Bs~{hA9JC+w>mVUtK_5ZyL9amDpcM2NbOtm7+CD(Y3g`-`3OWkZ+Vur6K?&av(V8Z@uUzxMtM)^Fa@2P zqs^rv9le>RkRg-83T~RgQdz)g*C^ef$WE0`1Wz;5t#~SBp|E}bbluC}O9&0rcEXjm=;|~Qu}Bhc zo_al|J3{(arT%GWkD!gMG^Vb!m9?tp*S&{O?J#%#njmF9UgkFJ@~C)+baQh!UD)m* z4L1#T&C@N|pBaA1wQq0O%58Uo3Im>Ut4as3vjB5`fwq-OIFl~i&IyBQV>N)In^a~= z0z)Pv9t+7M=QyRjoh@#Ccp4{yK<T=I#2k9J5&_PVbFU{ z<4lHDC`qSuq*n&;n-)6P!F@2s1Q0=YdyjgWv(S2rBcE|tJ6^5cRRAZr!Se